diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-01-08 13:15:45 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-01-08 14:47:14 -0800 |
| commit | fc386675692bfaa1d2eb7a96c2bc92b3ad471327 (patch) | |
| tree | 7d48f0ad3854f83bbe7543f130e67ce59cdc51d5 /META-INF | |
| parent | a03e77b8670faa133c76f4d7b29bf362246d20b5 (diff) | |
| parent | 1381cda86ddeca1b9829a9c53ff9372cfd816735 (diff) | |
| download | scala-fc386675692bfaa1d2eb7a96c2bc92b3ad471327.tar.gz scala-fc386675692bfaa1d2eb7a96c2bc92b3ad471327.tar.bz2 scala-fc386675692bfaa1d2eb7a96c2bc92b3ad471327.zip | |
Merge branch '2.10.x'
Patches applied:
- rename of `dropRepeatedParamType` to `dropIllegalStarTypes` -- required since 8886d22cd6
- fixed test/files/neg/t6406-regextract.flags -- how could this have worked before?
Conflicts:
src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala
src/library/scala/collection/LinearSeqOptimized.scala
src/library/scala/util/Properties.scala
test/files/run/streams.check
test/files/run/streams.scala
Diffstat (limited to 'META-INF')
| -rw-r--r-- | META-INF/MANIFEST.MF | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 4dd69827c3..4ee2d086ac 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -41,7 +41,7 @@ Export-Package: scala.reflect.internal.pickling, scala.reflect.internal.settings, scala.reflect.internal.util, - scala.reflect.makro, + scala.reflect.macros, scala.reflect.runtime, scala.reflect.internal.transform, scala.reflect.api, |