diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-01-17 20:29:33 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-01-17 20:30:15 -0800 |
| commit | 22ab72f3021b46435bef3437ff1d2ea3a7cc30c7 (patch) | |
| tree | eb072eefcd20d72944a0e445f5b0376df2c7e2af /test/files/presentation/t8085b.flags | |
| parent | 7c0fd124a636bb0dcca236d5aaf7e799c40d6104 (diff) | |
| parent | 97b9b2c06a5f562b749eb34834096118f21ca843 (diff) | |
| download | scala-22ab72f3021b46435bef3437ff1d2ea3a7cc30c7.tar.gz scala-22ab72f3021b46435bef3437ff1d2ea3a7cc30c7.tar.bz2 scala-22ab72f3021b46435bef3437ff1d2ea3a7cc30c7.zip | |
Merge commit '97b9b2c06a' from 2.10.x into master
Check files updated: test/files/presentation/t8085*.check
Conflicts:
build.xml
src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala
Diffstat (limited to 'test/files/presentation/t8085b.flags')
| -rw-r--r-- | test/files/presentation/t8085b.flags | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/files/presentation/t8085b.flags b/test/files/presentation/t8085b.flags new file mode 100644 index 0000000000..ec35b223d8 --- /dev/null +++ b/test/files/presentation/t8085b.flags @@ -0,0 +1 @@ +-sourcepath src |