diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-12-06 12:16:14 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-12-06 12:16:14 +0100 |
| commit | 2ea8aad5bc63582b563bb999c96e980597a84084 (patch) | |
| tree | bd1542c3e653ef13304624a23cbc6d1ee1b09633 /test/files/presentation/ide-t1001388.check | |
| parent | e0c2c14cd80fffa3f8af0836e55a5b8ca8c53d27 (diff) | |
| parent | 7d4109486b2266f8491d3473f43555dec6e996ee (diff) | |
| download | scala-2ea8aad5bc63582b563bb999c96e980597a84084.tar.gz scala-2ea8aad5bc63582b563bb999c96e980597a84084.tar.bz2 scala-2ea8aad5bc63582b563bb999c96e980597a84084.zip | |
Merge commit '7d41094' into merge/2.10.x-and-pr-3209-to-master
Conflicts:
src/interactive/scala/tools/nsc/interactive/CompilerControl.scala
Diffstat (limited to 'test/files/presentation/ide-t1001388.check')
| -rw-r--r-- | test/files/presentation/ide-t1001388.check | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/files/presentation/ide-t1001388.check b/test/files/presentation/ide-t1001388.check new file mode 100644 index 0000000000..d58f86d6c6 --- /dev/null +++ b/test/files/presentation/ide-t1001388.check @@ -0,0 +1 @@ +Test OK
\ No newline at end of file |