scala - The Scala programming language

	Commit message (Collapse)	Author	Age	Files	Lines
*	Documentation and some updates for the release build script	Lukas Rytz	2015-04-23	1	-3/+7
\|
*	Merge remote-tracking branch 'origin/2.11.x' into ↵	Jason Zaugg	2015-01-29	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge/2.11.x-to-2.12.x-20150129 Conflicts: build.number src/library/scala/concurrent/Future.scala versions.properties
\| *	Bump versions for 2.11.5 release.	Adriaan Moors	2015-01-04	1	-3/+3
\| \|
\| *	Bump version to 2.11.5 in build.number file.	Grzegorz Kossakowski	2014-10-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Scala 2.11.4 release has been staged, we should start publishing snapshots for Scala 2.11.5 now.
\| *	Bump version number in build.number to 2.11.4	Grzegorz Kossakowski	2014-10-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This should happen every time we cut a new release. We don't touch versions.properties files because that file specifies dependencies and we don't want to depend on broken Scala 2.11.3 release.
\| *	Bump versions for Scala 2.11.2	Lukas Rytz	2014-07-23	1	-1/+1
\| \|
\| *	Bump version number to 2.11.2	Adriaan Moors	2014-05-23	1	-1/+1
\| \|
* \|	Bump version for 2.12.x	Jason Zaugg	2014-05-06	1	-2/+2
\|/ \| \| \| \| \| \| \|	For this step, we still depend on _2.11 libraries (partest, xml, parser-combinators). After we release the first milestone of 2.12, we will update versions.property to bootstrap to 2.12 dependencies.
*	master now targets 2.11.1-SNAPSHOT	Jason Zaugg	2014-04-16	1	-1/+1
\| \| \| \| \| \| \|	Unlike in previous major releases, we haven't branched for 2.12 yet. So for the time being, master will continue to host 2.11.x, and we'll focus on BC changes in 2.11.1 for the next month before branching.
*	Bump version number for new nightlies.	Josh Suereth	2012-07-11	1	-1/+1
\|
*	Fixing merge conflicts for trunk.	Josh Suereth	2012-03-16	1	-2/+2
\|
*	Moved to Mirco's versioning idea.	Josh Suereth	2012-03-16	1	-0/+2
\| \| \| \| \| \|	Conflicts: build.xml
*	Fixes to build numbering system for 2.9.x release	Josh Suereth	2012-03-16	1	-0/+7
\| \| \| \| \| \| \|	Conflicts: build.number build.xml
*	fix maven publish version numbers	Lukas Rytz	2012-02-07	1	-5/+0
\|
*	Restored build.number.	Paul Phillips	2012-02-03	1	-0/+5
\| \| \| \| \| \| \|	As it is apparently used by maven. We're now at a local minimum of sensibility for the construction of build strings, but the good thing about local minima is that one can reasonably anticipate an upward climb. Or at least flatlining.
*	Fixing build string.	Paul Phillips	2012-02-01	1	-5/+0
\| \| \| \| \| \| \| \|	Version number turning up more than once. Looking at the situation I could only see the former mechanism as trouble. I deleted build.number and in ant am generating the build string only from tools/get-scala-revision. We may need to revisit when the time comes to build a release.
*	bumping up the version number in trunk.	Antonio Cunei	2011-03-17	1	-1/+1
\|
*	Bumped version number in trunk to 2.9.0	Antonio Cunei	2010-09-10	1	-2/+2
\|
*	Changed version number to 2.8.1. This is	Antonio Cunei	2010-09-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|	actually incorrect, as trunk has significantly diverged from 2.8.x, but it's better than leaving the version number in trunk at "2.8.0". We should just rename the version number in trunk at some point, so that it just lists "trunk" rather than "2.x.x".
*	reverted change to avoid merge conflict	michelou	2010-06-16	1	-1/+1
\|
*	updated version number in build.number file	michelou	2010-06-15	1	-1/+1
\|
*	Merging everything from the 2.8.x development b...	Antonio Cunei	2008-11-25	1	-3/+3
\| \| \| \| \| \| \| \|	Merging everything from the 2.8.x development branch back to trunk. - If you were working on trunk, please keep working on trunk If you were - working on 2.8-devel, please switch to trunk now
*	updating version number and starr to 2.7.2.RC4	Antonio Cunei	2008-10-27	1	-1/+1
\|
*	updating starr to 2.7.2.RC3	Antonio Cunei	2008-10-13	1	-1/+1
\|
*	updating version number and starr to 2.7.2.RC2	Lukas Rytz	2008-09-08	1	-1/+1
\|
*	updated starr to 2.7.2.RC1	Lukas Rytz	2008-08-20	1	-2/+2
\|
*	updating starr to 2.7.1.final	Lukas Rytz	2008-05-07	1	-1/+1
\|
*	updating starr to 2.7.1.RC2	Lukas Rytz	2008-04-21	1	-1/+1
\|
*	trunk/build.number for 2.7.1.RC1	Lukas Rytz	2008-04-10	1	-2/+2
\|
*	Changed version naming scheme to be Eclipse com...	Gilles Dubochet	2008-02-19	1	-1/+1
\| \| \| \| \|	Changed version naming scheme to be Eclipse compatible.
*	Updated STARR to 2.7.0-RC1	michelou	2008-02-07	1	-3/+3
\|
*	updated STARR to Scala 2.6.1-RC2	michelou	2007-12-14	1	-1/+1
\|
*	updated STARR to Scala 2.6.1-RC1	michelou	2007-12-03	1	-2/+2
\|
*	Updated STARR to Scala 2.6.0-final	michelou	2007-09-11	1	-2/+2
\|
*	Updated STARR to Scala 2.6.0-RC3	michelou	2007-09-05	1	-2/+2
\|
*	Updated STARR to Scala-2.6.0-RC2	michelou	2007-08-23	1	-1/+1
\|
*	Updated STARR to Scala-2.6.0-RC1	michelou	2007-07-27	1	-2/+2
\|
*	Updated STARR to Scala-2.5.1-RC1	michelou	2007-06-05	1	-2/+2
\|
*	Updated STARR to Scala 2.5.0-final	michelou	2007-05-21	1	-2/+2
\|
*	Updated STARR to Scala 2.5.0-RC1	michelou	2007-05-02	1	-3/+3
\|
*	updated STARR to Scala 2.4.0-final	michelou	2007-03-21	1	-2/+3
\|
*	update STARR to Scala 2.3.3	michelou	2007-01-25	1	-2/+2
\|
*	updated STARR to Scala 2.3.2	michelou	2007-01-23	1	-2/+2
\|
*	released Scala version 2.3.1v2.3.1	michelou	2006-12-06	1	-2/+2
\|
*	updated STARR to Scala 2.3.0	michelou	2006-11-23	1	-2/+2
\|
*	released Scala version 2.2.0	michelou	2006-10-11	1	-3/+3
\|
*	updated STARR to Scala 2.1.8	michelou	2006-08-23	1	-2/+2
\|
*	release version 2.1.7 of the Scala distributionv2.1.7	michelou	2006-07-19	1	-2/+2
\|
*	released Scala version 2.1.6v2.1.6	michelou	2006-06-16	1	-2/+2
\|
*	released Scala version 2.1.5v2.1.5	michelou	2006-05-24	1	-3/+2
\|