summaryrefslogtreecommitdiff
path: root/test/files/run/macro-reify-basic.check
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2012-04-12 18:55:13 -0700
committerMartin Odersky <odersky@gmail.com>2012-04-12 18:55:13 -0700
commit6061a22fcd3480e18e60254ad06c8a46b2f1ce53 (patch)
tree12e7d3a1798a186d641e3de21430fc6de0470727 /test/files/run/macro-reify-basic.check
parentf7a0558059559305a88ffa2c28506b29b2bc57f2 (diff)
parent39a88f5680c3a16bf7ca856683989a2f5481bf69 (diff)
downloadscala-6061a22fcd3480e18e60254ad06c8a46b2f1ce53.tar.gz
scala-6061a22fcd3480e18e60254ad06c8a46b2f1ce53.tar.bz2
scala-6061a22fcd3480e18e60254ad06c8a46b2f1ce53.zip
Merge branch 'master' into topic/sip18
Conflicts: src/compiler/scala/reflect/internal/Definitions.scala Various improvements to SIP 18 reporting. Made scala library and compiler feature-clean.
Diffstat (limited to 'test/files/run/macro-reify-basic.check')
-rw-r--r--test/files/run/macro-reify-basic.check1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/files/run/macro-reify-basic.check b/test/files/run/macro-reify-basic.check
new file mode 100644
index 0000000000..f35d3e67b4
--- /dev/null
+++ b/test/files/run/macro-reify-basic.check
@@ -0,0 +1 @@
+hello world