summaryrefslogtreecommitdiff
path: root/versions.properties
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-03-24 13:55:10 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-03-24 13:55:10 +1000
commitf25a78e7c7e65d428b250d2b219e27119f2d6223 (patch)
tree35fde33f332548441c83787d628d63253eb09f91 /versions.properties
parentfcc20fe4d3ac5caceb50965bc202b880e61f984c (diff)
parentb1b7f892e27d98601c7ced3b7f08e08b733dc284 (diff)
downloadscala-f25a78e7c7e65d428b250d2b219e27119f2d6223.tar.gz
scala-f25a78e7c7e65d428b250d2b219e27119f2d6223.tar.bz2
scala-f25a78e7c7e65d428b250d2b219e27119f2d6223.zip
Merge pull request #4371 from adriaanm/2.11.6-bump
Bump versions after 2.11.6 release.
Diffstat (limited to 'versions.properties')
-rw-r--r--versions.properties4
1 files changed, 2 insertions, 2 deletions
diff --git a/versions.properties b/versions.properties
index fa08e56346..096108a21f 100644
--- a/versions.properties
+++ b/versions.properties
@@ -4,7 +4,7 @@
# when adding new properties that influence a release,
# also add them to the update.versions mechanism in build.xml,
# which is used by scala-release-2.11.x in scala/jenkins-scripts
-starr.version=2.11.5
+starr.version=2.11.6
starr.use.released=1
# These are the versions of the modules that go with this release.
@@ -14,7 +14,7 @@ starr.use.released=1
scala.binary.version=2.11
# e.g. 2.11.0-RC1, 2.11.0, 2.11.1-RC1, 2.11.1
# this defines the dependency on scala-continuations-plugin in scala-dist's pom
-scala.full.version=2.11.5
+scala.full.version=2.11.6
# external modules shipped with distribution, as specified by scala-library-all's pom
scala-xml.version.number=1.0.3