diff options
| author | Paul Phillips <paulp@improving.org> | 2012-12-06 12:13:35 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-12-06 12:13:35 -0800 |
| commit | 330c77b097782ed389a83175302379ea72d22c41 (patch) | |
| tree | 8c7a1eb9f25d724b27d5ca33704ccb43bc0a7cb9 /META-INF/MANIFEST.MF | |
| parent | b1cb6578bdbdfaa66d3cf09f40dfc1511f7e9711 (diff) | |
| parent | 06844ee821ae500c7485498cc2054e3cf765623f (diff) | |
| download | scala-330c77b097782ed389a83175302379ea72d22c41.tar.gz scala-330c77b097782ed389a83175302379ea72d22c41.tar.bz2 scala-330c77b097782ed389a83175302379ea72d22c41.zip | |
Merge commit 'refs/pull/1717/head' into merge-msil-genjvm-delete
* commit 'refs/pull/1717/head':
SI-6769 Removes GenJVM backend
Conflicts:
src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala
Diffstat (limited to 'META-INF/MANIFEST.MF')
| -rw-r--r-- | META-INF/MANIFEST.MF | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 28a70d2879..53043cd99f 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Eclipse-LazyStart: true Bundle-ClassPath: ., bin, - lib/fjbg.jar, lib/jline.jar, lib/msil.jar Export-Package: @@ -50,8 +49,6 @@ Export-Package: ch.epfl.lamp.compiler.msil, ch.epfl.lamp.compiler.msil.emit, ch.epfl.lamp.compiler.msil.util, - ch.epfl.lamp.fjbg, - ch.epfl.lamp.util Require-Bundle: org.apache.ant, org.scala-ide.scala.library |