diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 10:23:06 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 10:23:06 +1000 |
| commit | 09f92d2b74badcdd989e9f17e60344e63b5483cf (patch) | |
| tree | bc991e16497412c0c5ca291124ea9d27eb7e6069 /versions.properties | |
| parent | af3881623cde655b37af77edb46b9e8c1b46b067 (diff) | |
| parent | 7ba38a07916426314cc3bff6999f3992757e0b26 (diff) | |
| download | scala-09f92d2b74badcdd989e9f17e60344e63b5483cf.tar.gz scala-09f92d2b74badcdd989e9f17e60344e63b5483cf.tar.bz2 scala-09f92d2b74badcdd989e9f17e60344e63b5483cf.zip | |
Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129
Conflicts:
build.number
src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
src/library/scala/collection/Iterator.scala
versions.properties
Diffstat (limited to 'versions.properties')
| -rw-r--r-- | versions.properties | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/versions.properties b/versions.properties index c334629d20..f218706904 100644 --- a/versions.properties +++ b/versions.properties @@ -17,8 +17,8 @@ scala.binary.version=2.11 scala.full.version=2.11.1 # external modules shipped with distribution, as specified by scala-library-all's pom -scala-xml.version.number=1.0.2 -scala-parser-combinators.version.number=1.0.1 +scala-xml.version.number=1.0.3 +scala-parser-combinators.version.number=1.0.2 scala-continuations-plugin.version.number=1.0.2 scala-continuations-library.version.number=1.0.2 scala-swing.version.number=1.0.1 |