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 /META-INF/MANIFEST.MF | |
| 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 'META-INF/MANIFEST.MF')
| -rw-r--r-- | META-INF/MANIFEST.MF | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 9cbe99ab23..28a70d2879 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -40,9 +40,13 @@ Export-Package: scala.tools.nsc.util, scala.tools.util, scala.reflect.internal, + scala.reflect.internal.pickling, scala.reflect.internal.settings, + scala.reflect.internal.util, + scala.reflect.makro, scala.reflect.runtime, scala.reflect.internal.transform, + scala.reflect.api, ch.epfl.lamp.compiler.msil, ch.epfl.lamp.compiler.msil.emit, ch.epfl.lamp.compiler.msil.util, |