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 /src/eclipse/scala-compiler/.classpath | |
| 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 'src/eclipse/scala-compiler/.classpath')
| -rw-r--r-- | src/eclipse/scala-compiler/.classpath | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/eclipse/scala-compiler/.classpath b/src/eclipse/scala-compiler/.classpath index 40a4ed9996..e6af46c68f 100644 --- a/src/eclipse/scala-compiler/.classpath +++ b/src/eclipse/scala-compiler/.classpath @@ -3,7 +3,6 @@ <classpathentry kind="src" path="compiler"/> <classpathentry combineaccessrules="false" kind="src" path="/reflect"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry combineaccessrules="false" kind="src" path="/fjbg"/> <classpathentry combineaccessrules="false" kind="src" path="/asm"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/ant/ant.jar"/> |