summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.11.x' into merge/2.11.x-to-2.12.x-20150624Jason Zaugg2015-06-24242-1645/+3885
|\
| * Merge pull request #4574 from janekdb/2.11.x-typos-g-iJason Zaugg2015-06-2325-25/+25
| |\
| | * Fix 25 typos (g-i)Janek Bogucki2015-06-2225-25/+25
| * | Merge pull request #4564 from som-snytt/issue/promptv2.11.7Adriaan Moors2015-06-2230-268/+315
| |\ \
| | * | SI-9206 Local refactor to save eyesightSom Snytt2015-06-212-42/+39
| | * | SI-9206 Accept paste with custom promptSom Snytt2015-06-214-24/+41
| | * | SI-9206 Verbose REPL prompt for info modeSom Snytt2015-06-191-6/+7
| | * | SI-9206 Fix REPL code indentationSom Snytt2015-06-1927-200/+223
| | * | SI-9206 REPL prompt is more easily configuredSom Snytt2015-06-192-12/+20
| | * | SI-9206 BooleanProp if set and not untrueSom Snytt2015-06-181-3/+4
| * | | Merge pull request #4572 from soc/topic/spec-historyAdriaan Moors2015-06-222-132/+154
| |\ \ \
| | * | | Spec: Add lost references, cleanupSimon Ochsenreither2015-06-222-132/+154
| * | | | Merge pull request #4566 from lrytz/t9359Adriaan Moors2015-06-2215-66/+175
| |\ \ \ \
| | * | | | Fix spurious test failure under -Ybackend:GenBCodeLukas Rytz2015-06-204-10/+6
| | * | | | SI-9359 Fix InnerClass entry flags for nested Java enumsLukas Rytz2015-06-1911-56/+169
| | | |/ / | | |/| |
| * | | | Merge pull request #4573 from backuitist/ticket/9253Seth Tisue2015-06-221-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | SI-9253 avoid IndexOutOfBoundsException in TypeMaps.correspondingTypeArgumentBruno Bieth2015-06-221-1/+1
| |/ / /
| * | | Merge pull request #4571 from janekdb/2.11.x-typos-d-fSeth Tisue2015-06-2133-36/+36
| |\ \ \ | | |_|/ | |/| |
| | * | Fix 36 typos (d-f)Janek Bogucki2015-06-2133-36/+36
| |/ /
| * | Merge pull request #4568 from adriaanm/endorgemsAdriaan Moors2015-06-191-1/+1
| |\ \
| | * | Pin to non-crashy redcarpetAdriaan Moors2015-06-191-1/+1
| |/ /
| * | Merge pull request #4563 from adriaanm/jline-shadeAdriaan Moors2015-06-1917-275/+373
| |\ \
| | * | SI-9339 Support classpaths with no single compatible jlineAdriaan Moors2015-06-187-13/+70
| | * | Centralize dependencies on jlineAdriaan Moors2015-06-1715-273/+314
| * | | Merge pull request #4331 from Ichoran/issue/8930Adriaan Moors2015-06-191-5/+12
| |\ \ \ | | |_|/ | |/| |
| | * | SI-8930 - Vector updated, +:, and :+ slow when typed as Seq[A]Rex Kerr2015-06-181-5/+12
| * | | Merge pull request #4559 from janekdb/2.11.x-scaladoc-2Seth Tisue2015-06-1825-33/+33
| |\ \ \
| | * | | Fix another several typosMichaƂ Pociecha2015-06-1810-12/+12
| | * | | Fix some typos (a-c)Janek Bogucki2015-06-1818-21/+21
| * | | | Merge pull request #4529 from lrytz/inlineAccessibilityJason Zaugg2015-06-196-25/+93
| |\ \ \ \
| | * | | | Fix illegal inlining of instructions accessing protected membersLukas Rytz2015-05-286-25/+93
| * | | | | Merge pull request #4543 from som-snytt/issue/7773Seth Tisue2015-06-181-10/+12
| |\ \ \ \ \
| | * | | | | SI-7773 Restore phase id to icode filenameSom Snytt2015-06-071-10/+12
| * | | | | | Merge pull request #4539 from vsalvis/vsalvis-docfixesSeth Tisue2015-06-186-31/+12
| |\ \ \ \ \ \
| | * | | | | | SI-6131 doc: remove broken show member link from all scaladoc pagesvsalvis2015-06-171-1/+0
| | * | | | | | SI-8543 doc: Move TODO out of NumericRange's scaladocvsalvis2015-06-171-4/+4
| | * | | | | | SI-8858 doc: fix note about PartialFunction in Function0, F1 and F2vsalvis2015-06-174-26/+8
| | |/ / / / /
| * | | | | | Merge pull request #4553 from som-snytt/issue/implicit-docSeth Tisue2015-06-182-2/+12
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | SI-9354 ScalaDoc members added via by-name viewSom Snytt2015-06-142-2/+12
| | |/ / / /
| * | | | | Merge pull request #4527 from nicky-zs/fix_BigDecimalLukas Rytz2015-06-182-2/+34
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | make BigDecimalTest.testMathContext a bit easier to understandZhong Sheng2015-06-181-13/+14
| | * | | | add more test for testMathContextZhong Sheng2015-05-291-2/+26
| | * | | | add unit test for MathContext lostZhong Sheng2015-05-281-0/+7
| | * | | | fix BigDecimal loosing MathContextZhong Sheng2015-05-271-2/+2
| * | | | | Merge pull request #4535 from retronym/topic/sbt-replAdriaan Moors2015-06-171-1/+6
| |\ \ \ \ \
| | * | | | | [sbt] Allow the REPL to be run from the SBT buildJason Zaugg2015-06-021-1/+6
| * | | | | | Merge pull request #4550 from YawarRaza7349/patch-2Adriaan Moors2015-06-171-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix missing quotes in EBNF of type aliasYawarRaza73492015-06-111-1/+1
| * | | | | | | Merge pull request #4560 from adriaanm/t9356Adriaan Moors2015-06-174-11/+30
| |\ \ \ \ \ \ \
| | * | | | | | | SI-9356 more careful assertion in back-endAdriaan Moors2015-06-164-11/+30
| | | |_|_|_|_|/ | | |/| | | | |