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 /build.detach.xml | |
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 'build.detach.xml')
-rw-r--r-- | build.detach.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/build.detach.xml b/build.detach.xml index 132c812a26..7845d59e1e 100644 --- a/build.detach.xml +++ b/build.detach.xml @@ -72,7 +72,6 @@ QUICK BUILD (QUICK) <path id="quick.classpath"> <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/compiler"/> - <pathelement location="${lib.dir}/fjbg.jar"/> <pathelement location="${lib.dir}/msil.jar"/> <pathelement location="${lib.dir}/forkjoin.jar"/> <pathelement location="${ant.home}/lib/ant.jar"/> |