diff options
author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-19 04:01:38 -0700 |
---|---|---|
committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-19 04:01:38 -0700 |
commit | fc892176ec4fd877bae4fc31ad7769ec15bbd858 (patch) | |
tree | c8df8b1b41bc102d689b029be7948e2245fda413 /test | |
parent | ed80616ccd9de9fead9553a93c5fbddfc1ea4275 (diff) | |
parent | e9307e17990ed536e437755a87f41cbd98fb62fc (diff) | |
download | scala-fc892176ec4fd877bae4fc31ad7769ec15bbd858.tar.gz scala-fc892176ec4fd877bae4fc31ad7769ec15bbd858.tar.bz2 scala-fc892176ec4fd877bae4fc31ad7769ec15bbd858.zip |
Merge pull request #3051 from retronym/merge/2.10.x-to-master-4
Merge 2.10.x to master (again)
Diffstat (limited to 'test')
-rw-r--r-- | test/disabled/presentation/doc.check (renamed from test/files/presentation/doc.check) | 0 | ||||
-rwxr-xr-x | test/disabled/presentation/doc/doc.scala (renamed from test/files/presentation/doc/doc.scala) | 0 | ||||
-rwxr-xr-x | test/disabled/presentation/doc/src/Class.scala (renamed from test/files/presentation/doc/src/Class.scala) | 0 | ||||
-rwxr-xr-x | test/disabled/presentation/doc/src/p/Base.scala (renamed from test/files/presentation/doc/src/p/Base.scala) | 0 | ||||
-rwxr-xr-x | test/disabled/presentation/doc/src/p/Derived.scala (renamed from test/files/presentation/doc/src/p/Derived.scala) | 0 | ||||
-rw-r--r-- | test/files/disabled/t7020.check (renamed from test/files/neg/t7020.check) | 0 | ||||
-rw-r--r-- | test/files/disabled/t7020.flags (renamed from test/files/neg/t7020.flags) | 0 | ||||
-rw-r--r-- | test/files/disabled/t7020.scala (renamed from test/files/neg/t7020.scala) | 0 |
8 files changed, 0 insertions, 0 deletions
diff --git a/test/files/presentation/doc.check b/test/disabled/presentation/doc.check index 5a3ff13151..5a3ff13151 100644 --- a/test/files/presentation/doc.check +++ b/test/disabled/presentation/doc.check diff --git a/test/files/presentation/doc/doc.scala b/test/disabled/presentation/doc/doc.scala index f2233f1828..f2233f1828 100755 --- a/test/files/presentation/doc/doc.scala +++ b/test/disabled/presentation/doc/doc.scala diff --git a/test/files/presentation/doc/src/Class.scala b/test/disabled/presentation/doc/src/Class.scala index a974bd6f5c..a974bd6f5c 100755 --- a/test/files/presentation/doc/src/Class.scala +++ b/test/disabled/presentation/doc/src/Class.scala diff --git a/test/files/presentation/doc/src/p/Base.scala b/test/disabled/presentation/doc/src/p/Base.scala index d91632b6f6..d91632b6f6 100755 --- a/test/files/presentation/doc/src/p/Base.scala +++ b/test/disabled/presentation/doc/src/p/Base.scala diff --git a/test/files/presentation/doc/src/p/Derived.scala b/test/disabled/presentation/doc/src/p/Derived.scala index 1a9c9a26d1..1a9c9a26d1 100755 --- a/test/files/presentation/doc/src/p/Derived.scala +++ b/test/disabled/presentation/doc/src/p/Derived.scala diff --git a/test/files/neg/t7020.check b/test/files/disabled/t7020.check index f9600ca7fc..f9600ca7fc 100644 --- a/test/files/neg/t7020.check +++ b/test/files/disabled/t7020.check diff --git a/test/files/neg/t7020.flags b/test/files/disabled/t7020.flags index e8fb65d50c..e8fb65d50c 100644 --- a/test/files/neg/t7020.flags +++ b/test/files/disabled/t7020.flags diff --git a/test/files/neg/t7020.scala b/test/files/disabled/t7020.scala index cc5421bab1..cc5421bab1 100644 --- a/test/files/neg/t7020.scala +++ b/test/files/disabled/t7020.scala |