summaryrefslogtreecommitdiff
path: root/lib/scala-library.jar.desired.sha1
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2012-04-26 15:35:57 -0700
committerSom Snytt <som.snytt@gmail.com>2012-04-26 15:35:57 -0700
commit2a9cce8a6859a34c259d0b399687df3a242de16b (patch)
treeca15e0b069265ff7ec43d147e613bb044f38c91a /lib/scala-library.jar.desired.sha1
parent47bfd744177121de08fed489a5b0b1b59a1ae06a (diff)
parentf7e1a4940386491b0691147b12b1b321c4cce2c5 (diff)
downloadscala-2a9cce8a6859a34c259d0b399687df3a242de16b.tar.gz
scala-2a9cce8a6859a34c259d0b399687df3a242de16b.tar.bz2
scala-2a9cce8a6859a34c259d0b399687df3a242de16b.zip
SI-5543: Merge with trunk
Reverts name unenmanglement that was objectionable in the previous patch commit 47bfd744177121de08fed489a5b0b1b59a1ae06a.
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 703eb006da..d059e861f0 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-1d53671b52f2052c0690fcef9c9989150d8a4704 ?scala-library.jar
+31c7188cef85c28b84b9ce35bc6780996e5dd139 ?scala-library.jar