| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
Resolved conflicts as in b0e05b67c7
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\| |
|
| |
| |
| |
| |
| | |
(just hitting the highlights here, not worrying yet about bumping the
dates in every modified source file)
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
To avoid duplication in scala/scala-dist, where it'll just go stale.
|