summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-01-30 12:13:06 -0800
committerPaul Phillips <paulp@improving.org>2012-01-30 12:13:06 -0800
commit04b49a57a4f222c208cc520e1bc459542bc4bc78 (patch)
tree3790daf4e6b046ed2868661f980ded8b6944c7fb
parent2bfb2e6de12a7cecd2f67a52ce5f8fe079b7ac5e (diff)
parente1897c215c8c0c7c09294c61fb636d33a0354493 (diff)
downloadscala-04b49a57a4f222c208cc520e1bc459542bc4bc78.tar.gz
scala-04b49a57a4f222c208cc520e1bc459542bc4bc78.tar.bz2
scala-04b49a57a4f222c208cc520e1bc459542bc4bc78.zip
Merge remote-tracking branch 'odersky/topic/inline' into inline
-rw-r--r--test/files/run/programmatic-main.check2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/programmatic-main.check b/test/files/run/programmatic-main.check
index b24b51ee27..a24de79b8a 100644
--- a/test/files/run/programmatic-main.check
+++ b/test/files/run/programmatic-main.check
@@ -4,7 +4,7 @@
namer 2 resolve names, attach symbols to named trees
packageobjects 3 load package objects
typer 4 the meat and potatoes: type the trees
- inlineclasses 5 add static methods to inline classes
+ extmethods 5 add extension methods for inline classes
superaccessors 6 add super accessors in traits and nested classes
pickler 7 serialize symbol tables
refchecks 8 reference/override checking, translate nested objects