summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-04-12 15:23:51 +0100
committerPaul Phillips <paulp@improving.org>2012-04-12 15:23:51 +0100
commite4976678fa7479c2a44f19b00cb691dc5b881609 (patch)
tree5b6749880f8662548979f5e57509258971854500 /lib
parentf9e8a8c13ff6f75f330766ae6e0febe431fc4b12 (diff)
parent46d0d73f66111d5d31b9fd593972970d7e9056bb (diff)
downloadscala-e4976678fa7479c2a44f19b00cb691dc5b881609.tar.gz
scala-e4976678fa7479c2a44f19b00cb691dc5b881609.tar.bz2
scala-e4976678fa7479c2a44f19b00cb691dc5b881609.zip
Merge commit 'refs/pull/375/head' into develop
Diffstat (limited to 'lib')
-rw-r--r--lib/scala-compiler.jar.desired.sha12
-rw-r--r--lib/scala-library.jar.desired.sha12
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
index 0bbbea1e7b..3f94b85db9 100644
--- a/lib/scala-compiler.jar.desired.sha1
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-f9fcb59f3dbe1b060f8c57d4463dde5e0796951f ?scala-compiler.jar
+82af2cfc6a81ae12f39c55c9cf684c5ec01971d3 ?scala-compiler.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index 703eb006da..bf1f4829f2 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-1d53671b52f2052c0690fcef9c9989150d8a4704 ?scala-library.jar
+6a58ca2e4398623145c179f4ce215bfb86a065c4 ?scala-library.jar