diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-01-15 16:48:56 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-01-16 10:35:09 -0800 |
| commit | 77dffe4aa79b414ab3f3a0a24c34140f1bbd6024 (patch) | |
| tree | 9f737ea5aff9db636e5c01b3792c675463957b43 /test/files/pos/t3999b.flags | |
| parent | ef332d2a265ab86a6ec415be61b7896a83068bca (diff) | |
| parent | 6f3ea77870ab5e17805ef0fc338c251e87870b8c (diff) | |
| download | scala-77dffe4aa79b414ab3f3a0a24c34140f1bbd6024.tar.gz scala-77dffe4aa79b414ab3f3a0a24c34140f1bbd6024.tar.bz2 scala-77dffe4aa79b414ab3f3a0a24c34140f1bbd6024.zip | |
Merge branch '2.10.x'
Conflicts:
src/compiler/scala/tools/nsc/doc/Settings.scala
src/compiler/scala/tools/nsc/interpreter/CompletionOutput.scala
src/compiler/scala/tools/nsc/matching/Patterns.scala
src/compiler/scala/tools/nsc/transform/UnCurry.scala
src/compiler/scala/tools/nsc/typechecker/Infer.scala
src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/reflect/scala/reflect/internal/settings/MutableSettings.scala
src/reflect/scala/reflect/runtime/Settings.scala
src/swing/scala/swing/SwingActor.scala
src/swing/scala/swing/SwingWorker.scala
test/files/run/t6955.scala
Diffstat (limited to 'test/files/pos/t3999b.flags')
| -rw-r--r-- | test/files/pos/t3999b.flags | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/files/pos/t3999b.flags b/test/files/pos/t3999b.flags new file mode 100644 index 0000000000..2f174c4732 --- /dev/null +++ b/test/files/pos/t3999b.flags @@ -0,0 +1 @@ +-Ycompanions-in-pkg-objs |