diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-05-17 17:01:20 +0200 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-05-17 11:16:39 -0700 |
| commit | b7c352a57f65458c66c78a368f75aaaa4a08e443 (patch) | |
| tree | 4b2b7fcea439948c5de65b05a392091a66eea0a4 /test/attic/files/cli/test1/Main.check.java | |
| parent | 4f8c306aca703c63282295c9f74f0cb35f9f85d4 (diff) | |
| parent | be405eed9bef9736f0142d6ddf53b6bf8af08696 (diff) | |
| download | scala-b7c352a57f65458c66c78a368f75aaaa4a08e443.tar.gz scala-b7c352a57f65458c66c78a368f75aaaa4a08e443.tar.bz2 scala-b7c352a57f65458c66c78a368f75aaaa4a08e443.zip | |
Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master
================================================================
Merge commit 'v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
src/reflect/scala/reflect/runtime/JavaMirrors.scala
================================================================
Merge -s ours 4e64a27 ([nomaster commit range])
================================================================
Merge commit '0ae7e55' into merge/v2.10.1-326-g4f8c306-to-master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Macros.scala
Diffstat (limited to 'test/attic/files/cli/test1/Main.check.java')
| -rw-r--r-- | test/attic/files/cli/test1/Main.check.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/test/attic/files/cli/test1/Main.check.java b/test/attic/files/cli/test1/Main.check.java deleted file mode 100644 index 64410de98f..0000000000 --- a/test/attic/files/cli/test1/Main.check.java +++ /dev/null @@ -1,6 +0,0 @@ -Unrecognized option: -cpp -Could not create the Java virtual machine. -1: test 1 passed (1) -1: test 2 passed (1) -1: test 3 passed (1) -1: test 4 passed (2) |