summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
|\ \ \ \ \ \ \
| * | | | | | | Update spec build to Jekyll 3.3Aaron S. Hawley2016-12-111-1/+1
* | | | | | | | Merge pull request #5531 from tabdulradi/SI-10060Lukas Rytz2016-12-122-2/+44
|\ \ \ \ \ \ \ \
| * | | | | | | | fixup! SI-10060 Fixes NumericRange.max bug on empty rangesTamer Mohammed Abdul-Radi2016-11-161-2/+14
| * | | | | | | | SI-10060 Fixes NumericRange.max bug on empty rangesTamer AbdulRadi2016-11-162-2/+32
* | | | | | | | | Merge pull request #5543 from retronym/ticket/10069Lukas Rytz2016-12-123-2/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-10069 Fix code gen errors with array updates, NothingJason Zaugg2016-12-023-2/+49
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5527 from som-snytt/fix/use-modern-replaceLukas Rytz2016-12-121-9/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | String.replaceAllLiterally is String.replaceSom Snytt2016-11-131-9/+3
* | | | | | | | | | Merge pull request #5550 from retronym/ticket/3772Lukas Rytz2016-12-129-25/+102
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor companion lookup methods after code reviewJason Zaugg2016-11-292-7/+6
| * | | | | | | | | | SI-3772 Fix detection of term-owned companionsJason Zaugg2016-11-299-25/+103
* | | | | | | | | | | Merge pull request #5569 from paplorinc/rotrLukas Rytz2016-12-122-19/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Changed hashing bit rotation to use Integer.rotateRightPap Lőrinc2016-12-072-19/+8
* | | | | | | | | | | | Merge pull request #5594 from retronym/topic/JEP-193Lukas Rytz2016-12-123-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Compiler support for JEP-193 VarHandle polymorphic signaturesJason Zaugg2016-12-123-5/+10
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #5545 from paplorinc/vectorCleanupStefan Zeiger2016-12-082-437/+331
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Applied further cleanup to VectorPap Lőrinc2016-12-061-56/+63
| * | | | | | | | | | | Changed >> to >>> in Vector to unify stylePap Lőrinc2016-12-061-118/+118
| * | | | | | | | | | | Applied suggestions to Vector cleanupPap Lőrinc2016-12-061-179/+161