diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-11-05 12:52:56 -0500 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-11-05 12:52:56 -0500 |
| commit | aedc853040d7774bd39df43a51715f674f99471e (patch) | |
| tree | 3d9fad1100c241b8663703898e46c030698eafe7 /project/Testing.scala | |
| parent | 999918311b7bf764916431485cb11043f1c220ed (diff) | |
| parent | 8b598436f64ca4e980c8a38f642085b4d23e2327 (diff) | |
| download | scala-aedc853040d7774bd39df43a51715f674f99471e.tar.gz scala-aedc853040d7774bd39df43a51715f674f99471e.tar.bz2 scala-aedc853040d7774bd39df43a51715f674f99471e.zip | |
Merge branch '2.10.0-wip' into merge-2.10.0
Diffstat (limited to 'project/Testing.scala')
| -rw-r--r-- | project/Testing.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/project/Testing.scala b/project/Testing.scala index cec1d8c60b..5de72116a3 100644 --- a/project/Testing.scala +++ b/project/Testing.scala @@ -29,12 +29,12 @@ trait Testing { self: ScalaBuild.type => val testsuite = ( Project("testsuite", file(".")) settings (testsuiteSettings:_*) - dependsOn (scalaLibrary, scalaCompiler, fjbg, partest, scalacheck, actorsMigration) + dependsOn (scalaLibrary, scalaCompiler, fjbg, partest, scalacheck) ) val continuationsTestsuite = ( Project("continuations-testsuite", file(".")) settings (continuationsTestsuiteSettings:_*) - dependsOn (partest, scalaLibrary, scalaCompiler, fjbg, actorsMigration) + dependsOn (partest, scalaLibrary, scalaCompiler, fjbg) ) } |