diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-06-24 16:23:40 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-06-24 16:23:40 -0700 |
| commit | fd526c7542492c1ddc4fffe075849fc245971cf4 (patch) | |
| tree | d707800acb823fa145322f1a907ed6a76f62f051 /versions.properties | |
| parent | 71cfa3764db8468ad465873728b3dc00cfcaf02f (diff) | |
| parent | 1f7417c763fb199cacc6afedc6e54796916fd673 (diff) | |
| download | scala-fd526c7542492c1ddc4fffe075849fc245971cf4.tar.gz scala-fd526c7542492c1ddc4fffe075849fc245971cf4.tar.bz2 scala-fd526c7542492c1ddc4fffe075849fc245971cf4.zip | |
Merge pull request #4578 from retronym/merge/2.11.x-to-2.12.x-20150624
Merge 2.11.x to 2.12.x
Diffstat (limited to 'versions.properties')
| -rw-r--r-- | versions.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/versions.properties b/versions.properties index 4fe8eff6ee..c0b67b16b3 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.3-scala-3 +scala-asm.version=5.0.4-scala-1 # external modules, used internally (not shipped) partest.version.number=1.0.7 |