summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Change `...' to ‘...’ (Unicode quotes) in ENBF (per intent per README.md).Daniel Barclay2016-10-035-109/+109
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #5450 from adriaanm/dev240Seth Tisue2016-10-201-2/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Repl prints '\n' as newline, not "^J"Adriaan Moors2016-10-081-2/+10
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5463 from adriaanm/merge-2.11-to-2.12Seth Tisue2016-10-207-24/+109
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge 2.11.x into 2.12.xAdriaan Moors2016-10-201-18/+22
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge pull request #5464 from retronym/backport/5386Seth Tisue2016-10-193-2/+7
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | [backport] Bump sbt.version to 0.13.12, without breakingDale Wijnand2016-10-193-2/+7
| | * | | | | | | | | | | Merge pull request #5467 from som-snytt/issue/9832-2.11-cleanupSeth Tisue2016-10-191-18/+22
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | SI-9832 Fix line endings in junit testSom Snytt2016-10-191-18/+22
| * | | | | | | | | | | | | Merge 2.11.x into 2.12.x, skipping backportsAdriaan Moors2016-10-180-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #5343 from milessabin/topic/si-2712-backportAdriaan Moors2016-10-1835-6/+509
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | SI-2712 Add support for higher order unificationMiles Sabin2016-08-1535-6/+509
| * | | | | | | | | | | | | | Merge 2.11.x into 2.12.xAdriaan Moors2016-10-182-5/+76
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge pull request #5453 from som-snytt/issue/9832-2.11Adriaan Moors2016-10-182-5/+76
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | SI-9832 -Xlint:help shows defaultSom Snytt2016-10-112-5/+76
| * | | | | | | | | | | | | | Merge 2.11.x into 2.12.x, skipping backportsAdriaan Moors2016-10-180-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge pull request #5345 from milessabin/topic/si-7046-backportAdriaan Moors2016-10-1821-13/+252
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Partial fix for SI-7046Miles Sabin2016-08-1521-13/+252
| | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge pull request #5341 from milessabin/topci/si-9760-backportAdriaan Moors2016-10-182-1/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | SI-9760 Fix for higher-kinded GADT refinementMiles Sabin2016-08-152-1/+18
| | | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge 2.11.x into 2.12.x, including #5239, #5240Adriaan Moors2016-10-182-2/+6
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge pull request #5240 from som-snytt/issue/9336-paste-tabAdriaan Moors2016-10-181-2/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | SI-9336 Enable paste detect in jlineSom Snytt2016-06-211-2/+5
| | * | | | | | | | | | | | | | Merge pull request #5239 from martijnhoekstra/doc_capitalizeAdriaan Moors2016-10-181-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | doc: capitalize only works on BMP charactersMartijn Hoekstra2016-06-211-0/+1
| | | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge 2.11.x into 2.12.xAdriaan Moors2016-10-180-0/+0
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge pull request #5348 from som-snytt/issue/9841-test-2.11Adriaan Moors2016-10-181-0/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | SI-9841 Regression test for init SOSom Snytt2016-08-241-0/+24
| | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge pull request #5218 from retronym/ticket/9806Jason Zaugg2016-10-182-2/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | SI-9806 Fix incorrect codegen with optimizer, constants, try/catchJason Zaugg2016-06-072-2/+20
| | * | | | | | | | | | | | | | Merge pull request #5444 from retronym/topic/typer-debugJason Zaugg2016-10-161-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Avoid tripping cyclic errors under -Ytyper-debugJason Zaugg2016-10-071-1/+1
| | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge 2.11.x into 2.12.xAdriaan Moors2016-10-183-17/+23
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge pull request #5405 from getfreebirdinc/2.11.xSeth Tisue2016-09-162-9/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | In ProcessBuilder docs, replace .lines w/ .lineStreamPaul Kernfeld2016-09-162-9/+9
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge pull request #5199 from dwijnand/remove-scala-langStefan Zeiger2016-07-181-10/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Make removing forkjoin dependant on the organization keyDale Wijnand2016-06-201-10/+14
| | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | Merge 2.11.x into 2.12.x, skipping #5236Adriaan Moors2016-10-180-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #5236 from som-snytt/issue/triple-backportLukas Rytz2016-07-132-1/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Avoid triple-quoting triple quotesSom Snytt2016-06-172-1/+9
* | | | | | | | | | | | | | Merge pull request #5468 from SethTisue/mima-0.1.11Seth Tisue2016-10-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | dogfood the new MiMaSeth Tisue2016-10-191-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5471 from VEINHORN/patch-1Seth Tisue2016-10-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix typo in GenTraversableLikeBoris Korogvich2016-10-201-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #5465 from adriaanm/licenseeAdriaan Moors2016-10-1810-15563/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Duplicate license in /LICENSE for GitHubAdriaan Moors2016-10-1810-15563/+32
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5386 from dwijnand/sbt-0.13.12Seth Tisue2016-10-183-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bump sbt.version to 0.13.12, without breakingDale Wijnand2016-09-223-2/+7
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5462 from retronym/topic/perm-size-be-goneSeth Tisue2016-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Avoid use of legacy JVM MaxPermSize option in partestJason Zaugg2016-10-181-1/+1
|/ / / / / / / / / / / /