diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-06-04 09:18:12 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-06-04 09:18:12 +0200 |
| commit | a6ecfa633a76162575ceb332b40ceed93eef490a (patch) | |
| tree | 79260bb4e91b00c72acff965b03cd6e0ef49f312 /test/files/neg/macro-invalidusage-presuper.check | |
| parent | b24e7573a17332606d9f9da49a397e02abec1b63 (diff) | |
| parent | 300db2a1e3eefc2a6ed379c870bc7da42a26e69a (diff) | |
| download | scala-a6ecfa633a76162575ceb332b40ceed93eef490a.tar.gz scala-a6ecfa633a76162575ceb332b40ceed93eef490a.tar.bz2 scala-a6ecfa633a76162575ceb332b40ceed93eef490a.zip | |
Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.11.x-20140604
Conflicts:
src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
Diffstat (limited to 'test/files/neg/macro-invalidusage-presuper.check')
0 files changed, 0 insertions, 0 deletions