summaryrefslogtreecommitdiff
path: root/lib/scala-library.jar.desired.sha1
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2011-04-20 12:19:47 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2011-04-20 12:19:47 +0000
commit517acfdd56af4562d3c4f2963f656f2834ca23e2 (patch)
tree609c95d6aafff786460300162991ce5b31fe8c32 /lib/scala-library.jar.desired.sha1
parente5ad9c55f8a7a97aa7c36a057078db2031f468e8 (diff)
downloadscala-517acfdd56af4562d3c4f2963f656f2834ca23e2.tar.gz
scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.tar.bz2
scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.zip
Fixing an incomplete svnmerge; second, merge ag...
Fixing an incomplete svnmerge; second, merge again from trunk.
Diffstat (limited to 'lib/scala-library.jar.desired.sha1')
-rw-r--r--lib/scala-library.jar.desired.sha12
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index 57adbeffc5..b0aa256cb4 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-af0438e6911f357a2af0d068482baa1f526dbac0 ?scala-library.jar
+678ada3690dd149c2bd302407e315a74de0bfd42 ?scala-library.jar