scala - The Scala programming language

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge 2.11.x into 2.12.x	Adriaan Moors	2017-04-07	1	-2/+2
\|\ \| \| \| \| \| \|	Include 828a892 Merge pull request #5753
\| *	bump copyright year to 2017	Philippus Baalman	2017-03-02	1	-2/+2
\| \|
* \|	Merge 2.11.x into 2.12.x	Adriaan Moors	2016-03-14	1	-1/+1
\|\\| \| \| \| \| \| \|	Resolved conflicts as in b0e05b67c7
\| *	Typesafe -> Lightbend in more places	Seth Tisue	2016-03-04	1	-1/+1
\| \|
* \|	Merge remote-tracking branch 'origin/2.11.x' into ↵	Jason Zaugg	2016-02-25	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge/2.11.x-to-2.12.x-20160225 Conflicts: scripts/jobs/integrate/bootstrap src/build/maven/scala-actors-pom.xml test/files/pos/t3420.flags Conflicts were trivial to resolve.
\| *	Typesafe is now Lightbend	Seth Tisue	2016-02-24	1	-1/+1
\| \|
* \|	Merge branch '2.11.x' into topic/merge-2.11.x-to-2.12.x-20160210	Jason Zaugg	2016-02-10	1	-2/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/library/scala/collection/Iterator.scala \| `-- trivial conflicts only. Parens were added to the next() calls in 2.12.x, while in the meantime `{Concat,Join}Iterator` were optimized in 2.11.x
\| *	bump copyright year to 2016	Seth Tisue	2016-02-03	1	-2/+2
\| \|
* \|	Add partial appearance update of inheritence graphs in scaladoc	Felix Mulder	2016-01-23	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit updates color and shape of the inheritence graphs. Also adds a dropshadow on hover instead of opacity change. Graphviz broke upon trying to include svg buttons instead of png. Looking for a solution.
* \|	Merge commit '4c6dcfe934' into 2.12.x	Adriaan Moors	2015-08-05	1	-2/+2
\|\\|
\| *	bump copyright year to 2015	Seth Tisue	2015-07-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	(just hitting the highlights here, not worrying yet about bumping the dates in every modified source file)
* \|	Remove further references to forkjoin	Jason Zaugg	2015-07-15	1	-6/+0
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use j.u.c.Forkjoin directly in active and disabled tests Remove bitrotted benchmarks code I was going to update these to use `java.util.concurrent.ForkJoin` directly, instead of our deprecated stubs. But most of them don't compile anymore (e.g. scala.testing.Benchmark has been removed, ClassTag imports missing). While I'm all for benchmarks, we should have large swathes of code checked in that isn't at compiled and run automatically. I'm happy to help someone resurrect these in a suitable form.
*	License formatting tweak, RTF version.	Adriaan Moors	2014-01-07	1	-0/+65
	To avoid duplication in scala/scala-dist, where it'll just go stale.