summaryrefslogtreecommitdiff
path: root/versions.properties
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2015-05-12 17:36:04 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2015-05-12 17:36:04 +0200
commitd253702f9f23186cbf95f611c2fd1a2d08330ad6 (patch)
tree9cd6198413ef8ea5e885559e4f3230373821c00c /versions.properties
parent819a559173c65ccf80a856ef46bc8f1d5996740a (diff)
parent297eeb335cbc50be9107d3f49cc7eb0487514ca7 (diff)
downloadscala-d253702f9f23186cbf95f611c2fd1a2d08330ad6.tar.gz
scala-d253702f9f23186cbf95f611c2fd1a2d08330ad6.tar.bz2
scala-d253702f9f23186cbf95f611c2fd1a2d08330ad6.zip
Merge commit '297eeb3' into merge-2.11-may-12
Diffstat (limited to 'versions.properties')
-rw-r--r--versions.properties1
1 files changed, 1 insertions, 0 deletions
diff --git a/versions.properties b/versions.properties
index bf89804d5d..b970be3c8e 100644
--- a/versions.properties
+++ b/versions.properties
@@ -26,6 +26,7 @@ scala-xml.version.number=1.0.4
scala-parser-combinators.version.number=1.0.4
scala-swing.version.number=1.0.2
jline.version=2.12.1
+scala-asm.version=5.0.3-scala-3
# external modules, used internally (not shipped)
partest.version.number=1.0.7