diff options
| author | Aleksandar Prokopec <axel22@gmail.com> | 2012-06-28 19:48:31 +0200 |
|---|---|---|
| committer | Aleksandar Prokopec <axel22@gmail.com> | 2012-06-28 19:48:31 +0200 |
| commit | b379ff4f59c139ff7d2b77e7e808f0b74aa9f268 (patch) | |
| tree | d531663cc08c71cc2631c119403af3032c71b543 /test/files/run/macro-reify-splice-splice/Macros_1.scala | |
| parent | 2f0d94c02ab328a3f8da25b5ab8f402a68143af3 (diff) | |
| parent | 6f08c06a35a0b70c49e23a296b13ac391a460584 (diff) | |
| download | scala-b379ff4f59c139ff7d2b77e7e808f0b74aa9f268.tar.gz scala-b379ff4f59c139ff7d2b77e7e808f0b74aa9f268.tar.bz2 scala-b379ff4f59c139ff7d2b77e7e808f0b74aa9f268.zip | |
Merge branch 'master' into issue/5846,4597,4027,4112
Conflicts:
src/library/scala/collection/MapLike.scala
src/library/scala/collection/SortedMapLike.scala
Diffstat (limited to 'test/files/run/macro-reify-splice-splice/Macros_1.scala')
| -rw-r--r-- | test/files/run/macro-reify-splice-splice/Macros_1.scala | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/files/run/macro-reify-splice-splice/Macros_1.scala b/test/files/run/macro-reify-splice-splice/Macros_1.scala index 030a0a217e..4f1b600f63 100644 --- a/test/files/run/macro-reify-splice-splice/Macros_1.scala +++ b/test/files/run/macro-reify-splice-splice/Macros_1.scala @@ -1,5 +1,4 @@ import scala.reflect.makro.{Context => Ctx} -import scala.reflect.{mirror => mr} object Macros { def foo = macro Impls.foo |