diff options
| author | amin <nada.amin@epfl.ch> | 2012-08-21 15:20:40 +0200 |
|---|---|---|
| committer | amin <nada.amin@epfl.ch> | 2012-08-21 15:20:40 +0200 |
| commit | 6ea65ac798637950472d6c04b9168053d2af158d (patch) | |
| tree | 3b87673de0cf9c28df39d6187334f3e5fbedd2ca /test/pending/neg/plugin-rightafter-terminal.check | |
| parent | 2b93ace3518ce48f145d3afb8d4e1abe9fcb26aa (diff) | |
| parent | 1ab4994990a21c1ea4dadcf15368013d89456ca6 (diff) | |
| download | scala-6ea65ac798637950472d6c04b9168053d2af158d.tar.gz scala-6ea65ac798637950472d6c04b9168053d2af158d.tar.bz2 scala-6ea65ac798637950472d6c04b9168053d2af158d.zip | |
Merge branch '2.10.x'
Review by @paulp or @gkossakowski.
Conflicts:
src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
src/compiler/scala/tools/nsc/transform/UnCurry.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/reflect/scala/reflect/internal/Types.scala
Diffstat (limited to 'test/pending/neg/plugin-rightafter-terminal.check')
0 files changed, 0 insertions, 0 deletions