summaryrefslogtreecommitdiff
path: root/versions.properties
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2015-06-26 16:46:33 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2015-06-26 16:46:33 +0200
commitd785aed9a40f25abc005d5f6e2281b80058743a8 (patch)
tree760c94231a841bd701996af697a2b3f411f76422 /versions.properties
parentd90d8b89687be5c817cc081ed970328c6d8fd13f (diff)
parentbb102e7125005b0a479396ceb8a93e400a67b643 (diff)
downloadscala-d785aed9a40f25abc005d5f6e2281b80058743a8.tar.gz
scala-d785aed9a40f25abc005d5f6e2281b80058743a8.tar.bz2
scala-d785aed9a40f25abc005d5f6e2281b80058743a8.zip
Merge commit 'bb102e7' into merge-2.11-to-2.12-june-26
Diffstat (limited to 'versions.properties')
-rw-r--r--versions.properties2
1 files changed, 1 insertions, 1 deletions
diff --git a/versions.properties b/versions.properties
index c0b67b16b3..5fd2ac4b71 100644
--- a/versions.properties
+++ b/versions.properties
@@ -26,7 +26,7 @@ scala-xml.version.number=1.0.4
scala-parser-combinators.version.number=1.0.4
scala-swing.version.number=2.0.0-M2
jline.version=2.12.1
-scala-asm.version=5.0.4-scala-1
+scala-asm.version=5.0.4-scala-2
# external modules, used internally (not shipped)
partest.version.number=1.0.7