summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5517 from SethTisue/remove-manifest-mfJason Zaugg2016-11-111-51/+0
|\
| * remove old, now-unused MANIFEST.MF fileSeth Tisue2016-11-091-51/+0
* | Merge pull request #5303 from xuwei-k/isNaN-boxingJason Zaugg2016-11-112-7/+7
|\ \
| * | avoid boxingxuwei-k2016-10-282-7/+7
* | | Merge pull request #5335 from rumoku/SI-9888Jason Zaugg2016-11-114-8/+24
|\ \ \
| * | | SI-9888. Prevent OOM on ParRange. Improve toString.Vladimir Glushak2016-10-024-8/+24
* | | | Merge pull request #5387 from dwijnand/root-project-scala-versionJason Zaugg2016-11-111-6/+3
|\ \ \ \
| * | | | Define the root sbt project's scalaVersionDale Wijnand2016-11-101-6/+3
* | | | | Merge pull request #5516 from Ichoran/non-slow-vector-twelveJason Zaugg2016-11-117-13/+11
|\ \ \ \ \
| * | | | | Manually inlined all other instances of Platform.arraycopy to System.arraycopyRex Kerr2016-11-096-8/+7
| * | | | | Improved runtime speed for Vector, restoring previous performance.Rex Kerr2016-11-091-5/+4
* | | | | | Merge pull request #5497 from szeiger/wip/sd-254Jason Zaugg2016-11-111-4/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Don’t include scala-asm.jar in scala-compiler.jarStefan Zeiger2016-11-101-4/+9
* | | | | | Merge pull request #5503 from dsbos/dsbos-SpecFixQuotesInProseSeth Tisue2016-11-102-4/+4
|\ \ \ \ \ \
| * | | | | | Fix two instances of ASCII `...' quoting to Unicode ‘...’ (to match others).Daniel Barclay2016-11-051-2/+2
| * | | | | | Added U+hhhh values for quote characters to clarify.Daniel Barclay2016-11-051-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5432 from dwijnand/partest-scalac_optsAdriaan Moors2016-11-101-1/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add support for -Dpartest.scalac_opts to the partest commandDale Wijnand2016-09-291-1/+4
* | | | | | Merge pull request #5460 from som-snytt/issue/6978Jason Zaugg2016-11-104-1/+14
|\ \ \ \ \ \
| * | | | | | SI-6978 No linting of Java parensSom Snytt2016-10-154-1/+14
* | | | | | | Merge pull request #5486 from som-snytt/issue/6734-synthsJason Zaugg2016-11-102-3/+35
|\ \ \ \ \ \ \
| * | | | | | | SI-6734 CommentSom Snytt2016-10-312-16/+11
| * | | | | | | SI-6734 Synthesize companion near case classSom Snytt2016-10-272-3/+40
* | | | | | | | Merge pull request #5509 from lrytz/t10032Lukas Rytz2016-11-105-20/+288
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix returns from within finalizersLukas Rytz2016-11-095-26/+101
| * | | | | | | | SI-10032 Fix code gen with returns in nested try-finally blocksLukas Rytz2016-11-083-7/+200
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #5501 from SethTisue/sbt-deprecationsJason Zaugg2016-11-102-66/+73
|\ \ \ \ \ \ \ \
| * | | | | | | | sbt build: omit `: _*` when calling `.settings`Seth Tisue2016-11-081-51/+51
| * | | | | | | | Don’t rely on deprecated ScalaInstance methodsStefan Zeiger2016-11-071-2/+6
| * | | | | | | | Avoid 2 more deprecated sbt 0.12 operatorsDale Wijnand2016-11-042-2/+2
| * | | | | | | | avoid deprecated sbt 0.12 operatorsSeth Tisue2016-11-042-11/+14
| |/ / / / / / /
* | | | | | | | Merge pull request #5507 from viktorklang/wip-SI-10034-√Jason Zaugg2016-11-102-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Regression: Make Future.failed(e).failed turn into a success instead of failureViktor Klang2016-11-082-2/+2
| |/ / / / / /
* | | | | | | Merge pull request #5510 from retronym/merge/2.11.x-to-2.12.x-20161108Lukas Rytz2016-11-083-13/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge commit 'fe47ef0' into 2.12.xJason Zaugg2016-11-081-0/+4
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #5504 from retronym/topic/sbt-macro-warnSeth Tisue2016-11-071-0/+4
| | |\ \ \ \ \ \
| | | * | | | | | Silence SBT logging about macros and incremental compilation.Jason Zaugg2016-11-071-0/+4
| * | | | | | | | Merge commit '2f2f0f7' into 2.12.xJason Zaugg2016-11-080-0/+0
| |\| | | | | | |
| | * | | | | | | Merge pull request #5478 from dragos/backport/remove-println-SI-8717Adriaan Moors2016-10-283-6/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | [backport] Replace println with log calls in BrowsingLoadersIulian Dragos2016-10-253-6/+4
| * | | | | | | | | Merge commit 'b9a16c4' into 2.12.xJason Zaugg2016-11-082-13/+16
|/| | | | | | | | | | |/ / / / / / / /
| * | | | | | | | Merge pull request #5378 from som-snytt/issue/9913Seth Tisue2016-10-262-13/+16
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | SI-9913 Tighten bolts on span iteratorSom Snytt2016-09-061-13/+10
| | * | | | | | | SI-9913 Lead span iterator finishes at state -1Som Snytt2016-09-052-1/+7
* | | | | | | | | Merge pull request #5469 from adriaanm/java-scan-tailrecAdriaan Moors2016-11-046-104/+88
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add regression tests for SI-10027Jakob Odersky2016-11-033-0/+18
| * | | | | | | | | Factor out some more into ScaladocScannerAdriaan Moors2016-10-192-30/+26
| * | | | | | | | | DocScanner has doc-comment scanning hooks.Adriaan Moors2016-10-193-67/+46
| * | | | | | | | | Keep `skipBlockComment` tail recursiveAdriaan Moors2016-10-192-39/+30
* | | | | | | | | | Merge pull request #5499 from xuwei-k/patch-1Adriaan Moors2016-11-041-1/+1
|\ \ \ \ \ \ \ \ \ \