summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2009-12-16 16:16:46 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2009-12-16 16:16:46 +0000
commit7b63fe2cbd4226525dbf0cd54633ae2c6f722ee6 (patch)
treee7f805b33baa6d46dd201df82f0e8b5311606fb5
parent77c181c62a5edf52e7eca110d2f94c32997226fc (diff)
downloadscala-7b63fe2cbd4226525dbf0cd54633ae2c6f722ee6.tar.gz
scala-7b63fe2cbd4226525dbf0cd54633ae2c6f722ee6.tar.bz2
scala-7b63fe2cbd4226525dbf0cd54633ae2c6f722ee6.zip
Merged revisions 20160 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r20160 | cunei | 2009-12-16 17:16:09 +0100 (Wed, 16 Dec 2009) | 3 lines Reverting r19988 (restoring test for #1801). No review. ........
-rw-r--r--test/files/jvm/t1801.check (renamed from test/pending/jvm/t1801.check)0
-rw-r--r--test/files/jvm/t1801.scala (renamed from test/pending/jvm/t1801.scala)0
2 files changed, 0 insertions, 0 deletions
diff --git a/test/pending/jvm/t1801.check b/test/files/jvm/t1801.check
index bf78a99db9..bf78a99db9 100644
--- a/test/pending/jvm/t1801.check
+++ b/test/files/jvm/t1801.check
diff --git a/test/pending/jvm/t1801.scala b/test/files/jvm/t1801.scala
index 6ed7c56336..6ed7c56336 100644
--- a/test/pending/jvm/t1801.scala
+++ b/test/files/jvm/t1801.scala