diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-20 22:46:08 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-20 22:48:34 -0800 |
commit | 9712cd07ea5bd9acd34d4e7f5ba2180dbdee7fee (patch) | |
tree | f432c928c34d95ed3a434cf0673828282d93bd5a /test/files/presentation/ide-t1000567/src/b/b.scala | |
parent | 70956e560a11996e1d801d59b312dfe9d56b7a74 (diff) | |
parent | 2952d0fa020c003e919dff0eea0bc63f7d52fba8 (diff) | |
download | scala-9712cd07ea5bd9acd34d4e7f5ba2180dbdee7fee.tar.gz scala-9712cd07ea5bd9acd34d4e7f5ba2180dbdee7fee.tar.bz2 scala-9712cd07ea5bd9acd34d4e7f5ba2180dbdee7fee.zip |
Merge 2.10.x into master.
Conflicts:
build.number
src/compiler/scala/tools/nsc/doc/base/MemberLookupBase.scala
src/compiler/scala/tools/nsc/typechecker/Macros.scala
test/files/presentation/doc/doc.scala
Diffstat (limited to 'test/files/presentation/ide-t1000567/src/b/b.scala')
-rw-r--r-- | test/files/presentation/ide-t1000567/src/b/b.scala | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/files/presentation/ide-t1000567/src/b/b.scala b/test/files/presentation/ide-t1000567/src/b/b.scala new file mode 100644 index 0000000000..a0185b15cf --- /dev/null +++ b/test/files/presentation/ide-t1000567/src/b/b.scala @@ -0,0 +1,5 @@ +package b + +class Bar extends a.Foo { + println(x) +} |