Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5651 from rorygraves/2.12.x_symbol_marking | Jason Zaugg | 2017-01-20 | 1 | -3/+9 |
|\ | |||||
| * | Improve performance of Symbol marking | Rory Graves | 2017-01-16 | 1 | -3/+9 |
* | | Merge pull request #5637 from ichaki5748/Sl-10113 | Seth Tisue | 2017-01-18 | 3 | -0/+57 |
|\ \ | |/ |/| | |||||
| * | SI-10113 mutable.TreeMap.range does not work | Evgeny Slutsky | 2017-01-09 | 3 | -0/+57 |
* | | Merge pull request #5636 from adriaanm/jline-2.14.3-2.12.x | Adriaan Moors | 2017-01-10 | 3 | -16/+8 |
|\ \ | |/ |/| | |||||
| * | Revert "Repl prints '\n' as newline, not "^J"" | Adriaan Moors | 2017-01-09 | 1 | -10/+2 |
| * | Upgrade to jline2 2.14.3 | Adriaan Moors | 2017-01-09 | 2 | -6/+6 |
|/ | |||||
* | Merge pull request #5621 from som-snytt/issue/9936-more | Lukas Rytz | 2017-01-03 | 4 | -4/+22 |
|\ | |||||
| * | SI-9936 LinearSeqOptimized.indexWhere | Som Snytt | 2016-12-30 | 4 | -4/+22 |
|/ | |||||
* | Merge pull request #5607 from adriaanm/rebase-5551 | Adriaan Moors | 2016-12-21 | 3 | -0/+65 |
|\ | |||||
| * | Override equals and hashCode for WrappedArray | Alexey Romanov | 2016-12-21 | 3 | -0/+65 |
* | | Merge pull request #5583 from lrytz/t10093 | Adriaan Moors | 2016-12-21 | 5 | -8/+52 |
|\ \ | |||||
| * | | SI-10093 don't move member traits to constructor body in constructors | Lukas Rytz | 2016-12-06 | 5 | -8/+52 |
* | | | Merge pull request #5610 from dwijnand/sbt | Lukas Rytz | 2016-12-21 | 16 | -22/+22 |
|\ \ \ | |||||
| * | | | Fix how "sbt" is written | Dale Wijnand | 2016-12-21 | 16 | -22/+22 |
|/ / / | |||||
* | | | Merge pull request #5608 from retronym/merge/2.11.x-to-2.12.x-20161220 | Lukas Rytz | 2016-12-20 | 36 | -58/+474 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2016... | Jason Zaugg | 2016-12-20 | 36 | -58/+474 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Merge pull request #5605 from szeiger/wip/fix-07-links | Adriaan Moors | 2016-12-19 | 2 | -4/+4 |
| | |\ \ | |||||
| | | * | | Fix spec links to `07-implicits.html` | Stefan Zeiger | 2016-12-18 | 2 | -4/+4 |
| | * | | | Merge pull request #5604 from sjrd/scalajs-friendly-assertthrows | Lukas Rytz | 2016-12-17 | 1 | -5/+4 |
| | |\ \ \ | |||||
| | | * | | | Use ClassTag instead of Manifest in AssertUtil.assertThrows. | Sébastien Doeraene | 2016-12-17 | 1 | -5/+4 |
| | |/ / / | |||||
| | * | | | Merge pull request #5487 from lrytz/java-constants | Adriaan Moors | 2016-12-15 | 22 | -2/+341 |
| | |\ \ \ | |||||
| | | * | | | neg test for parsing constants in Java sources | Lukas Rytz | 2016-11-02 | 7 | -0/+104 |
| | | * | | | Support implicit converstions from java literals | Lukas Rytz | 2016-11-02 | 1 | -38/+41 |
| | | * | | | SI-3236 constant types for literal final static java fields | Johannes Rudolph | 2016-10-28 | 15 | -2/+234 |
| | * | | | | Merge pull request #5454 from som-snytt/issue/9834-2.11 | Adriaan Moors | 2016-12-15 | 7 | -16/+78 |
| | |\ \ \ \ | |||||
| | | * | | | | SI-9834 Show expansion of update on error | Som Snytt | 2016-11-25 | 2 | -3/+5 |
| | | * | | | | SI-9834 Improve error on failed op= | Som Snytt | 2016-11-25 | 7 | -16/+76 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | Merge pull request #5590 from 2m/mima-0.1.13-scala-2.11 | Seth Tisue | 2016-12-12 | 3 | -26/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | Upgrade MiMa to 0.1.13 | Martynas Mickevičius | 2016-12-08 | 3 | -26/+2 |
| | * | | | | | Merge pull request #5574 from ptrcarta/patch-1 | Lukas Rytz | 2016-12-12 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | fix eBNF error by removing wrong closing brace | ptrcarta | 2016-12-02 | 1 | -1/+1 |
| | | |/ / / / | |||||
| | * / / / / | SI-10086 NumericRange.min|max with custom Integral (#5575) | Tobias Schlatter | 2016-12-12 | 2 | -2/+46 |
| | |/ / / / | |||||
* | | | | | | Merge pull request #5598 from retronym/topic/jdk9-bootcp-repl-javap | Lukas Rytz | 2016-12-20 | 2 | -4/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Support extra module references in the REPL | Jason Zaugg | 2016-12-12 | 2 | -4/+8 |
* | | | | | | Merge pull request #5539 from som-snytt/issue/10068 | Adriaan Moors | 2016-12-19 | 8 | -4/+66 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-10068 Only permit elidable methods | Som Snytt | 2016-12-14 | 8 | -4/+66 |
* | | | | | | | Merge pull request #5541 from retronym/ticket/10067 | Adriaan Moors | 2016-12-19 | 5 | -1/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-10067 Don't speculatively emit outer tests for inner Java classes | Jason Zaugg | 2016-11-18 | 2 | -3/+1 |
| * | | | | | | | SI-10067 Java defined inner classes don't have outer accessors | Jason Zaugg | 2016-11-18 | 5 | -1/+31 |
* | | | | | | | | Merge pull request #5588 from retronym/ticket/10098 | Jason Zaugg | 2016-12-15 | 1 | -8/+5 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | S-10098 Fix regression in Unix runner script with JAVA_HOME unset | Jason Zaugg | 2016-12-08 | 1 | -8/+5 |
* | | | | | | | | Merge pull request #5602 from retronym/ticket/SD-290 | Lukas Rytz | 2016-12-14 | 2 | -2/+41 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Modules w. serializable type alias "companions" are not serializable | Jason Zaugg | 2016-12-14 | 2 | -2/+41 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #5558 from larsrh/topic/deprecated-y-flags | Adriaan Moors | 2016-12-13 | 15 | -75/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | delete dead code | Lars Hupel | 2016-12-01 | 1 | -2/+0 |
| * | | | | | | | | remove deprecated compiler flag "-Yinfer-by-name" | Lars Hupel | 2016-12-01 | 6 | -32/+3 |
| * | | | | | | | | remove deprecated compiler flag "-Yeta-expand-keeps-star" | Lars Hupel | 2016-12-01 | 11 | -42/+3 |
* | | | | | | | | | Merge pull request #5593 from ashawley/spec-jekyll-3 | Adriaan Moors | 2016-12-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update spec build to Jekyll 3.3 | Aaron S. Hawley | 2016-12-11 | 1 | -1/+1 |
| | |_|_|/ / / / / | |/| | | | | | | |