diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 10:29:33 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 10:29:33 +1000 |
| commit | 8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6 (patch) | |
| tree | 9b91ee264a8a4abf936b4b2c939591decb751313 /build.number | |
| parent | 020581e795a677b838fa62f67064fe9a55b02ba0 (diff) | |
| parent | 7b5998a0592ee707c02a13859fe1520687c76c38 (diff) | |
| download | scala-8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6.tar.gz scala-8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6.tar.bz2 scala-8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150129
Conflicts:
build.number
src/library/scala/concurrent/Future.scala
versions.properties
Diffstat (limited to 'build.number')
| -rw-r--r-- | build.number | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build.number b/build.number index 142ae5027d..78e98dffb3 100644 --- a/build.number +++ b/build.number @@ -5,5 +5,5 @@ version.patch=0 # This is the -N part of a version. if it's 0, it's dropped from maven versions. version.bnum=0 -# Note: To build a release run ant with -Dbuild.release=true -# To build an RC, run ant with -Dmaven.version.suffix=-RCN +# To build a release, see scripts/jobs/scala-release-2.11.x-build +# (normally run by the eponymous job on scala-ci.typesafe.com).
\ No newline at end of file |