Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 |
* | | | | | | | | Merge pull request #5531 from tabdulradi/SI-10060 | Lukas Rytz | 2016-12-12 | 2 | -2/+44 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fixup! SI-10060 Fixes NumericRange.max bug on empty ranges | Tamer Mohammed Abdul-Radi | 2016-11-16 | 1 | -2/+14 |
| * | | | | | | | | SI-10060 Fixes NumericRange.max bug on empty ranges | Tamer AbdulRadi | 2016-11-16 | 2 | -2/+32 |
* | | | | | | | | | Merge pull request #5543 from retronym/ticket/10069 | Lukas Rytz | 2016-12-12 | 3 | -2/+49 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | SI-10069 Fix code gen errors with array updates, Nothing | Jason Zaugg | 2016-12-02 | 3 | -2/+49 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #5527 from som-snytt/fix/use-modern-replace | Lukas Rytz | 2016-12-12 | 1 | -9/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | String.replaceAllLiterally is String.replace | Som Snytt | 2016-11-13 | 1 | -9/+3 |
* | | | | | | | | | | Merge pull request #5550 from retronym/ticket/3772 | Lukas Rytz | 2016-12-12 | 9 | -25/+102 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Refactor companion lookup methods after code review | Jason Zaugg | 2016-11-29 | 2 | -7/+6 |
| * | | | | | | | | | | SI-3772 Fix detection of term-owned companions | Jason Zaugg | 2016-11-29 | 9 | -25/+103 |
* | | | | | | | | | | | Merge pull request #5569 from paplorinc/rotr | Lukas Rytz | 2016-12-12 | 2 | -19/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Changed hashing bit rotation to use Integer.rotateRight | Pap Lőrinc | 2016-12-07 | 2 | -19/+8 |
* | | | | | | | | | | | | Merge pull request #5594 from retronym/topic/JEP-193 | Lukas Rytz | 2016-12-12 | 3 | -5/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Compiler support for JEP-193 VarHandle polymorphic signatures | Jason Zaugg | 2016-12-12 | 3 | -5/+10 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #5545 from paplorinc/vectorCleanup | Stefan Zeiger | 2016-12-08 | 2 | -437/+331 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Applied further cleanup to Vector | Pap Lőrinc | 2016-12-06 | 1 | -56/+63 |
| * | | | | | | | | | | | Changed >> to >>> in Vector to unify style | Pap Lőrinc | 2016-12-06 | 1 | -118/+118 |
| * | | | | | | | | | | | Applied suggestions to Vector cleanup | Pap Lőrinc | 2016-12-06 | 1 | -179/+161 |