summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #5729 from scala/revert-5658-topic/hashhashAdriaan Moors2017-02-223-24/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Revert "Fix erasure of the qualifier of ##"Adriaan Moors2017-02-223-24/+6
|/ / / / / /
* | | | | | Merge pull request #5681 from Philippus/issue/9704Lukas Rytz2017-02-223-3/+33
|\ \ \ \ \ \
| * | | | | | moved Pattern and TagsNotToClose to a HtmlTag companion objectPhilippus Baalman2017-02-211-4/+6
| * | | | | | SI-9704 don't add a closed HtmlTag if it is already closedPhilippus Baalman2017-02-083-1/+29
* | | | | | | Merge pull request #5726 from scala/revert-5629-issue/10120-quote-errAdriaan Moors2017-02-2116-84/+76
|\ \ \ \ \ \ \
| * | | | | | | Revert "SI-10133 Require escaped single quote char lit"Adriaan Moors2017-02-2116-84/+76
|/ / / / / / /
* | | | | | | Merge pull request #5663 from gourlaysama/ticket/sd-256-enable-repl-colors-un...Adriaan Moors2017-02-214-2/+16
|\ \ \ \ \ \ \
| * | | | | | | SD-256 enable colored output by default on unixAntoine Gourlay2017-02-214-2/+16
* | | | | | | | Merge pull request #5658 from retronym/topic/hashhashLukas Rytz2017-02-213-6/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix erasure of the qualifier of ##Jason Zaugg2017-01-243-6/+24
* | | | | | | | Merge pull request #5708 from szeiger/issue/si10194Lukas Rytz2017-02-212-7/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-10194: Fix abstract type resolution for overloaded HOFsStefan Zeiger2017-02-212-7/+22
* | | | | | | | | Merge pull request #5700 from retronym/ticket/10154-refactorLukas Rytz2017-02-213-39/+43
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor implementation of lookupCompanionJason Zaugg2017-02-193-39/+43
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #5704 from som-snytt/issue/10190-elide-stringLukas Rytz2017-02-214-16/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-10190 Elide string to empty instead of nullSom Snytt2017-02-154-16/+38
* | | | | | | | | | Merge pull request #5640 from optimizely/repl-import-handlerAdriaan Moors2017-02-207-19/+131
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix ImportHandler's reporting of importedNames and importedSymbolsHao Xia2017-01-115-17/+102
| * | | | | | | | | | Fix SIOOBE in Name#pos for substrings of length 1Jason Zaugg2017-01-102-2/+29
* | | | | | | | | | | Merge pull request #5629 from som-snytt/issue/10120-quote-errAdriaan Moors2017-02-2016-76/+84
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SI-10120 ReplReporter handles message indentSom Snytt2017-01-1812-68/+51
| * | | | | | | | | | | SI-10120 Extra advice on unclosed char literalSom Snytt2017-01-084-8/+21
| * | | | | | | | | | | SI-10133 Require escaped single quote char litSom Snytt2017-01-083-1/+13
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #5660 from som-snytt/issue/9464-specAdriaan Moors2017-02-201-4/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SI-9464 Clarify spec on no final traitSom Snytt2017-01-241-4/+6
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #5659 from retronym/ticket/10026Adriaan Moors2017-02-206-6/+38
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | SI-10026 Fix endless cycle in runtime reflectionJason Zaugg2017-02-196-6/+38
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5707 from retronym/topic/java9-prepareLukas Rytz2017-02-2016-3/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Workaround bug in Scala runtime reflection on JDK 9Jason Zaugg2017-02-1613-0/+25
| * | | | | | | | | | Avoid ambiguous overload on JDK 9Jason Zaugg2017-02-161-1/+1
| * | | | | | | | | | Adapt to change in ClassLoader in JDK 9Jason Zaugg2017-02-161-1/+1
| * | | | | | | | | | Bump scala-asm versionJason Zaugg2017-02-161-1/+1
* | | | | | | | | | | Merge pull request #5709 from adriaanm/sam_wild_boundLukas Rytz2017-02-202-0/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Ignore BoundedWildcardType in erasure type mapAdriaan Moors2017-02-192-0/+16
* | | | | | | | | | | | Merge pull request #5711 from retronym/ticket/jrtLukas Rytz2017-02-203-30/+99
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Faster and simpler Java 9 classpath implementationJason Zaugg2017-02-173-30/+99
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5713 from janekdb/issue/GH-644/sync-jekyll-README-to-GemfileLukas Rytz2017-02-201-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | GH-644: Expand note regarding Jekyll versionsJanek Bogucki2017-02-171-1/+5
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5714 from dragos/issue/usage-sterr-SI-10178Lukas Rytz2017-02-201-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | SI-10178 Route reporter.echo to stdoutIulian Dragos2017-02-181-2/+10
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #5717 from som-snytt/issue/10148-followupAdriaan Moors2017-02-192-5/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | SI-10148 Accept verbose zeroSom Snytt2017-02-182-5/+13
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5716 from adriaanm/i296Jason Zaugg2017-02-191-1/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Ensure ordering for args to `choose` in DurationTestAdriaan Moors2017-02-171-1/+4
* | | | | | | | | | Merge pull request #5710 from SethTisue/sd-303Adriaan Moors2017-02-171-3/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | fix recent regression: macro paradise + Java sources = MatchErrorSeth Tisue2017-02-171-3/+7
| |/ / / / / / / /
* | | | | | | | | Merge pull request #5701 from SethTisue/merge-2.11.x-to-2.12.x-20170214Adriaan Moors2017-02-1737-133/+1710
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch '2.12.x' into merge-2.11.x-to-2.12.x-20170214Seth Tisue2017-02-1789-1757/+632
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #5693 from markusjura/lineStream-warningsSeth Tisue2017-02-171-2/+2
|\ \ \ \ \ \ \ \ \