summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-12-06 12:13:35 -0800
committerPaul Phillips <paulp@improving.org>2012-12-06 12:13:35 -0800
commit330c77b097782ed389a83175302379ea72d22c41 (patch)
tree8c7a1eb9f25d724b27d5ca33704ccb43bc0a7cb9 /lib
parentb1cb6578bdbdfaa66d3cf09f40dfc1511f7e9711 (diff)
parent06844ee821ae500c7485498cc2054e3cf765623f (diff)
downloadscala-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 'lib')
-rw-r--r--lib/fjbg.jar.desired.sha11
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/fjbg.jar.desired.sha1 b/lib/fjbg.jar.desired.sha1
deleted file mode 100644
index 6f3ccc77bd..0000000000
--- a/lib/fjbg.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8acc87f222210b4a5eb2675477602fc1759e7684 *fjbg.jar