diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 10:23:06 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 10:23:06 +1000 |
| commit | 09f92d2b74badcdd989e9f17e60344e63b5483cf (patch) | |
| tree | bc991e16497412c0c5ca291124ea9d27eb7e6069 /test/files/pos/t7683-stop-after-parser/sample_2.scala | |
| parent | af3881623cde655b37af77edb46b9e8c1b46b067 (diff) | |
| parent | 7ba38a07916426314cc3bff6999f3992757e0b26 (diff) | |
| download | scala-09f92d2b74badcdd989e9f17e60344e63b5483cf.tar.gz scala-09f92d2b74badcdd989e9f17e60344e63b5483cf.tar.bz2 scala-09f92d2b74badcdd989e9f17e60344e63b5483cf.zip | |
Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129
Conflicts:
build.number
src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
src/library/scala/collection/Iterator.scala
versions.properties
Diffstat (limited to 'test/files/pos/t7683-stop-after-parser/sample_2.scala')
| -rw-r--r-- | test/files/pos/t7683-stop-after-parser/sample_2.scala | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/files/pos/t7683-stop-after-parser/sample_2.scala b/test/files/pos/t7683-stop-after-parser/sample_2.scala new file mode 100644 index 0000000000..7eb11b8204 --- /dev/null +++ b/test/files/pos/t7683-stop-after-parser/sample_2.scala @@ -0,0 +1,6 @@ + +package sample + +// just a sample that is compiled with the explosive plugin disabled +object Sample extends App { +} |