diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-08-21 12:04:13 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-08-21 12:04:13 +0200 |
| commit | ed230b51affa509a03298182b281afce5a74a87d (patch) | |
| tree | 42bd553213abeddaa4e430d7d43b676635b9eca1 /test/files/neg/macro-invalidimpl-a | |
| parent | 7b351dca8458f599f5fafef4daa307351031ef06 (diff) | |
| parent | 60d462ef6e0dba5f9a7c4cc81255fcb9fba7939a (diff) | |
| download | scala-ed230b51affa509a03298182b281afce5a74a87d.tar.gz scala-ed230b51affa509a03298182b281afce5a74a87d.tar.bz2 scala-ed230b51affa509a03298182b281afce5a74a87d.zip | |
Merge remote-tracking branch 'origin/2.10.2' into merge/2.10.2-to-2.10.x
Better late than never.
Conflicts:
src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
Diffstat (limited to 'test/files/neg/macro-invalidimpl-a')
0 files changed, 0 insertions, 0 deletions