summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-03-14 11:42:00 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2016-03-14 11:42:00 -0700
commit6f6fdeaea946e2cfec66bd73468a31d208b6f373 (patch)
treedcc6577e82f8d074c4c3d3f936a3f0d3f90801f6 /project
parent66588a78f22aa3595df9938449268e432f27e3ff (diff)
parent8821a9f68ccb452659714546208d8802675b23dd (diff)
downloadscala-6f6fdeaea946e2cfec66bd73468a31d208b6f373.tar.gz
scala-6f6fdeaea946e2cfec66bd73468a31d208b6f373.tar.bz2
scala-6f6fdeaea946e2cfec66bd73468a31d208b6f373.zip
Merge commit 2.11.x into 2.12.x.
Diffstat (limited to 'project')
-rw-r--r--project/build.properties2
1 files changed, 1 insertions, 1 deletions
diff --git a/project/build.properties b/project/build.properties
index 817bc38df8..43b8278c68 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.11