diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-09-10 11:51:30 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-09-10 11:51:30 +0200 |
| commit | aa4524a309abca23537cdc3c3f0b3d730d8a22a6 (patch) | |
| tree | 5ff9ccddd87690fcf1c17f34d3e4d54fb1718ed1 /test/scaladoc/run/t7767.check | |
| parent | 8e686339cef40028c8707b2fbcc5061269b4531a (diff) | |
| parent | 1015d129a5ce69aad8c273734b23e35c7648b686 (diff) | |
| download | scala-aa4524a309abca23537cdc3c3f0b3d730d8a22a6.tar.gz scala-aa4524a309abca23537cdc3c3f0b3d730d8a22a6.tar.bz2 scala-aa4524a309abca23537cdc3c3f0b3d730d8a22a6.zip | |
Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-master
Conflicts:
src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
Diffstat (limited to 'test/scaladoc/run/t7767.check')
| -rw-r--r-- | test/scaladoc/run/t7767.check | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/scaladoc/run/t7767.check b/test/scaladoc/run/t7767.check new file mode 100644 index 0000000000..619c56180b --- /dev/null +++ b/test/scaladoc/run/t7767.check @@ -0,0 +1 @@ +Done. |