Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4578 from retronym/merge/2.11.x-to-2.12.x-20150624 | Adriaan Moors | 2015-06-24 | 242 | -1645/+3885 |
|\ | |||||
| * | Merge branch '2.11.x' into merge/2.11.x-to-2.12.x-20150624 | Jason Zaugg | 2015-06-24 | 242 | -1645/+3885 |
| |\ | |||||
| | * | Merge pull request #4574 from janekdb/2.11.x-typos-g-i | Jason Zaugg | 2015-06-23 | 25 | -25/+25 |
| | |\ | |||||
| | | * | Fix 25 typos (g-i) | Janek Bogucki | 2015-06-22 | 25 | -25/+25 |
| | * | | Merge pull request #4564 from som-snytt/issue/promptv2.11.7 | Adriaan Moors | 2015-06-22 | 30 | -268/+315 |
| | |\ \ | |||||
| | | * | | SI-9206 Local refactor to save eyesight | Som Snytt | 2015-06-21 | 2 | -42/+39 |
| | | * | | SI-9206 Accept paste with custom prompt | Som Snytt | 2015-06-21 | 4 | -24/+41 |
| | | * | | SI-9206 Verbose REPL prompt for info mode | Som Snytt | 2015-06-19 | 1 | -6/+7 |
| | | * | | SI-9206 Fix REPL code indentation | Som Snytt | 2015-06-19 | 27 | -200/+223 |
| | | * | | SI-9206 REPL prompt is more easily configured | Som Snytt | 2015-06-19 | 2 | -12/+20 |
| | | * | | SI-9206 BooleanProp if set and not untrue | Som Snytt | 2015-06-18 | 1 | -3/+4 |
| | * | | | Merge pull request #4572 from soc/topic/spec-history | Adriaan Moors | 2015-06-22 | 2 | -132/+154 |
| | |\ \ \ | |||||
| | | * | | | Spec: Add lost references, cleanup | Simon Ochsenreither | 2015-06-22 | 2 | -132/+154 |
| | * | | | | Merge pull request #4566 from lrytz/t9359 | Adriaan Moors | 2015-06-22 | 15 | -66/+175 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix spurious test failure under -Ybackend:GenBCode | Lukas Rytz | 2015-06-20 | 4 | -10/+6 |
| | | * | | | | SI-9359 Fix InnerClass entry flags for nested Java enums | Lukas Rytz | 2015-06-19 | 11 | -56/+169 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | Merge pull request #4573 from backuitist/ticket/9253 | Seth Tisue | 2015-06-22 | 1 | -1/+1 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | SI-9253 avoid IndexOutOfBoundsException in TypeMaps.correspondingTypeArgument | Bruno Bieth | 2015-06-22 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #4571 from janekdb/2.11.x-typos-d-f | Seth Tisue | 2015-06-21 | 33 | -36/+36 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Fix 36 typos (d-f) | Janek Bogucki | 2015-06-21 | 33 | -36/+36 |
| | |/ / | |||||
| | * | | Merge pull request #4568 from adriaanm/endorgems | Adriaan Moors | 2015-06-19 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Pin to non-crashy redcarpet | Adriaan Moors | 2015-06-19 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge pull request #4563 from adriaanm/jline-shade | Adriaan Moors | 2015-06-19 | 17 | -275/+373 |
| | |\ \ | |||||
| | | * | | SI-9339 Support classpaths with no single compatible jline | Adriaan Moors | 2015-06-18 | 7 | -13/+70 |
| | | * | | Centralize dependencies on jline | Adriaan Moors | 2015-06-17 | 15 | -273/+314 |
| | * | | | Merge pull request #4331 from Ichoran/issue/8930 | Adriaan Moors | 2015-06-19 | 1 | -5/+12 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | SI-8930 - Vector updated, +:, and :+ slow when typed as Seq[A] | Rex Kerr | 2015-06-18 | 1 | -5/+12 |
| | * | | | Merge pull request #4559 from janekdb/2.11.x-scaladoc-2 | Seth Tisue | 2015-06-18 | 25 | -33/+33 |
| | |\ \ \ | |||||
| | | * | | | Fix another several typos | MichaĆ Pociecha | 2015-06-18 | 10 | -12/+12 |
| | | * | | | Fix some typos (a-c) | Janek Bogucki | 2015-06-18 | 18 | -21/+21 |
| | * | | | | Merge pull request #4529 from lrytz/inlineAccessibility | Jason Zaugg | 2015-06-19 | 6 | -25/+93 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix illegal inlining of instructions accessing protected members | Lukas Rytz | 2015-05-28 | 6 | -25/+93 |
| | * | | | | | Merge pull request #4543 from som-snytt/issue/7773 | Seth Tisue | 2015-06-18 | 1 | -10/+12 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | SI-7773 Restore phase id to icode filename | Som Snytt | 2015-06-07 | 1 | -10/+12 |
| | * | | | | | | Merge pull request #4539 from vsalvis/vsalvis-docfixes | Seth Tisue | 2015-06-18 | 6 | -31/+12 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | SI-6131 doc: remove broken show member link from all scaladoc pages | vsalvis | 2015-06-17 | 1 | -1/+0 |
| | | * | | | | | | SI-8543 doc: Move TODO out of NumericRange's scaladoc | vsalvis | 2015-06-17 | 1 | -4/+4 |
| | | * | | | | | | SI-8858 doc: fix note about PartialFunction in Function0, F1 and F2 | vsalvis | 2015-06-17 | 4 | -26/+8 |
| | | |/ / / / / | |||||
| | * | | | | | | Merge pull request #4553 from som-snytt/issue/implicit-doc | Seth Tisue | 2015-06-18 | 2 | -2/+12 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | | * | | | | | SI-9354 ScalaDoc members added via by-name view | Som Snytt | 2015-06-14 | 2 | -2/+12 |
| | | |/ / / / | |||||
| | * | | | | | Merge pull request #4527 from nicky-zs/fix_BigDecimal | Lukas Rytz | 2015-06-18 | 2 | -2/+34 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | | * | | | | make BigDecimalTest.testMathContext a bit easier to understand | Zhong Sheng | 2015-06-18 | 1 | -13/+14 |
| | | * | | | | add more test for testMathContext | Zhong Sheng | 2015-05-29 | 1 | -2/+26 |
| | | * | | | | add unit test for MathContext lost | Zhong Sheng | 2015-05-28 | 1 | -0/+7 |
| | | * | | | | fix BigDecimal loosing MathContext | Zhong Sheng | 2015-05-27 | 1 | -2/+2 |
| | * | | | | | Merge pull request #4535 from retronym/topic/sbt-repl | Adriaan Moors | 2015-06-17 | 1 | -1/+6 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | [sbt] Allow the REPL to be run from the SBT build | Jason Zaugg | 2015-06-02 | 1 | -1/+6 |
| | * | | | | | | Merge pull request #4550 from YawarRaza7349/patch-2 | Adriaan Moors | 2015-06-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fix missing quotes in EBNF of type alias | YawarRaza7349 | 2015-06-11 | 1 | -1/+1 |
| | * | | | | | | | Merge pull request #4560 from adriaanm/t9356 | Adriaan Moors | 2015-06-17 | 4 | -11/+30 |
| | |\ \ \ \ \ \ \ |