diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-20 14:33:59 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-20 15:07:28 -0700 |
| commit | 2097a653642927c39b1cb614546240ac9213f3fb (patch) | |
| tree | 646778309893b3394fc36c720bd0bda4e0f86006 /test/files/run/t6394a.check | |
| parent | feb77881ff8bc1e46c8ae4317a9d95cbf97e34bd (diff) | |
| parent | c065bde5f50cae3e1fa6d0724e2043818d6301e9 (diff) | |
| download | scala-2097a653642927c39b1cb614546240ac9213f3fb.tar.gz scala-2097a653642927c39b1cb614546240ac9213f3fb.tar.bz2 scala-2097a653642927c39b1cb614546240ac9213f3fb.zip | |
Merge branch '2.10.x'
* 2.10.x: (36 commits)
Normalized line endings.
New .gitattributes file.
Disabled failing build manager tests.
New test case for SI-6337
New test case for closing SI-6385
Value classes: eliminated half-boxing
Cleanup of OverridingPairs
Fixes SI-6260
Use faster download URL now that artifactory is fixed.
don't try to create tags w/o scala-reflect.jar
some small remaining fixes
SI-5943 toolboxes now autoimport Predef and scala
Fix for loud test.
SI-6363 deploys the updated starr
SI-6363 removes scala.reflect.base
SI-6392 wraps non-terms before typecheck/eval
SI-6394 fixes macros.Context.enclosingClass
Error message improvement for SI-6336.
Adjustments to scala.concurrent.duration.
prepping for the refactoring
...
Conflicts:
src/actors-migration/scala/actors/Pattern.scala
src/compiler/scala/tools/nsc/Global.scala
src/compiler/scala/tools/nsc/transform/Erasure.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/library/scala/collection/immutable/Vector.scala
test/files/jvm/actmig-PinS_1.scala
test/files/jvm/actmig-PinS_2.scala
test/files/jvm/actmig-PinS_3.scala
test/files/jvm/actmig-public-methods_1.scala
Diffstat (limited to 'test/files/run/t6394a.check')
| -rw-r--r-- | test/files/run/t6394a.check | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/files/run/t6394a.check b/test/files/run/t6394a.check new file mode 100644 index 0000000000..2a02d41ce2 --- /dev/null +++ b/test/files/run/t6394a.check @@ -0,0 +1 @@ +TEST |