summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* adjust to partest 1.1.0's new mixed Java/Scala compilationLukas Rytz2017-01-2724-55/+67
* Merge pull request #5651 from rorygraves/2.12.x_symbol_markingJason Zaugg2017-01-201-3/+9
|\
| * Improve performance of Symbol markingRory Graves2017-01-161-3/+9
* | Merge pull request #5637 from ichaki5748/Sl-10113Seth Tisue2017-01-183-0/+57
|\ \ | |/ |/|
| * SI-10113 mutable.TreeMap.range does not workEvgeny Slutsky2017-01-093-0/+57
* | Merge pull request #5636 from adriaanm/jline-2.14.3-2.12.xAdriaan Moors2017-01-103-16/+8
|\ \ | |/ |/|
| * Revert "Repl prints '\n' as newline, not "^J""Adriaan Moors2017-01-091-10/+2
| * Upgrade to jline2 2.14.3Adriaan Moors2017-01-092-6/+6
|/
* Merge pull request #5621 from som-snytt/issue/9936-moreLukas Rytz2017-01-034-4/+22
|\
| * SI-9936 LinearSeqOptimized.indexWhereSom Snytt2016-12-304-4/+22
|/
* Merge pull request #5607 from adriaanm/rebase-5551Adriaan Moors2016-12-213-0/+65
|\
| * Override equals and hashCode for WrappedArrayAlexey Romanov2016-12-213-0/+65
* | Merge pull request #5583 from lrytz/t10093Adriaan Moors2016-12-215-8/+52
|\ \
| * | SI-10093 don't move member traits to constructor body in constructorsLukas Rytz2016-12-065-8/+52
* | | Merge pull request #5610 from dwijnand/sbtLukas Rytz2016-12-2116-22/+22
|\ \ \
| * | | Fix how "sbt" is writtenDale Wijnand2016-12-2116-22/+22
|/ / /
* | | Merge pull request #5608 from retronym/merge/2.11.x-to-2.12.x-20161220Lukas Rytz2016-12-2036-58/+474
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2016...Jason Zaugg2016-12-2036-58/+474
| |\ \ \ | | |_|/ | |/| |
| | * | Merge pull request #5605 from szeiger/wip/fix-07-linksAdriaan Moors2016-12-192-4/+4
| | |\ \
| | | * | Fix spec links to `07-implicits.html`Stefan Zeiger2016-12-182-4/+4
| | * | | Merge pull request #5604 from sjrd/scalajs-friendly-assertthrowsLukas Rytz2016-12-171-5/+4
| | |\ \ \
| | | * | | Use ClassTag instead of Manifest in AssertUtil.assertThrows.Sébastien Doeraene2016-12-171-5/+4
| | |/ / /
| | * | | Merge pull request #5487 from lrytz/java-constantsAdriaan Moors2016-12-1522-2/+341
| | |\ \ \
| | | * | | neg test for parsing constants in Java sourcesLukas Rytz2016-11-027-0/+104
| | | * | | Support implicit converstions from java literalsLukas Rytz2016-11-021-38/+41
| | | * | | SI-3236 constant types for literal final static java fieldsJohannes Rudolph2016-10-2815-2/+234
| | * | | | Merge pull request #5454 from som-snytt/issue/9834-2.11Adriaan Moors2016-12-157-16/+78
| | |\ \ \ \
| | | * | | | SI-9834 Show expansion of update on errorSom Snytt2016-11-252-3/+5
| | | * | | | SI-9834 Improve error on failed op=Som Snytt2016-11-257-16/+76
| | | | |/ / | | | |/| |
| | * | | | Merge pull request #5590 from 2m/mima-0.1.13-scala-2.11Seth Tisue2016-12-123-26/+2
| | |\ \ \ \
| | | * | | | Upgrade MiMa to 0.1.13Martynas Mickevičius2016-12-083-26/+2
| | * | | | | Merge pull request #5574 from ptrcarta/patch-1Lukas Rytz2016-12-121-1/+1
| | |\ \ \ \ \
| | | * | | | | fix eBNF error by removing wrong closing braceptrcarta2016-12-021-1/+1
| | | |/ / / /
| | * / / / / SI-10086 NumericRange.min|max with custom Integral (#5575)Tobias Schlatter2016-12-122-2/+46
| | |/ / / /
* | | | | | Merge pull request #5598 from retronym/topic/jdk9-bootcp-repl-javapLukas Rytz2016-12-202-4/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Support extra module references in the REPLJason Zaugg2016-12-122-4/+8
* | | | | | Merge pull request #5539 from som-snytt/issue/10068Adriaan Moors2016-12-198-4/+66
|\ \ \ \ \ \
| * | | | | | SI-10068 Only permit elidable methodsSom Snytt2016-12-148-4/+66
* | | | | | | Merge pull request #5541 from retronym/ticket/10067Adriaan Moors2016-12-195-1/+29
|\ \ \ \ \ \ \
| * | | | | | | SI-10067 Don't speculatively emit outer tests for inner Java classesJason Zaugg2016-11-182-3/+1
| * | | | | | | SI-10067 Java defined inner classes don't have outer accessorsJason Zaugg2016-11-185-1/+31
* | | | | | | | Merge pull request #5588 from retronym/ticket/10098Jason Zaugg2016-12-151-8/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | S-10098 Fix regression in Unix runner script with JAVA_HOME unsetJason Zaugg2016-12-081-8/+5
* | | | | | | | Merge pull request #5602 from retronym/ticket/SD-290Lukas Rytz2016-12-142-2/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Modules w. serializable type alias "companions" are not serializableJason Zaugg2016-12-142-2/+41
|/ / / / / / / /
* | | | | | | | Merge pull request #5558 from larsrh/topic/deprecated-y-flagsAdriaan Moors2016-12-1315-75/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | delete dead codeLars Hupel2016-12-011-2/+0
| * | | | | | | | remove deprecated compiler flag "-Yinfer-by-name"Lars Hupel2016-12-016-32/+3
| * | | | | | | | remove deprecated compiler flag "-Yeta-expand-keeps-star"Lars Hupel2016-12-0111-42/+3
* | | | | | | | | Merge pull request #5593 from ashawley/spec-jekyll-3Adriaan Moors2016-12-121-1/+1
|\ \ \ \ \ \ \ \ \