Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'abd595d' into merge/2.11.x-to-2.12.x-20140915 | Jason Zaugg | 2014-09-16 | 17 | -15/+289 |
|\ | |||||
| * | Merge pull request #3946 from gourlaysama/wip/t5254 | Grzegorz Kossakowski | 2014-09-09 | 1 | -0/+23 |
| |\ | |||||
| | * | SI-5254 running an empty scala script should succeed | Antoine Gourlay | 2014-08-26 | 1 | -0/+23 |
| * | | Merge pull request #3939 from lrytz/ystats | Lukas Rytz | 2014-09-08 | 5 | -7/+120 |
| |\ \ | |||||
| | * | | Address PR feedback, fix MultiChoiceSetting.contains | Lukas Rytz | 2014-09-08 | 1 | -0/+2 |
| | * | | Use Enumeration for MultiChoiceSetting | Som Snytt | 2014-09-05 | 1 | -1/+45 |
| | * | | -Ystatistics accepts a list of phases, cleanups in MultiChoiceSetting | Lukas Rytz | 2014-09-02 | 1 | -1/+62 |
| | * | | Fix assertThrows, and the behaviors that it shadowed | Lukas Rytz | 2014-09-02 | 4 | -6/+12 |
| * | | | Merge pull request #3935 from lrytz/t8803 | Jason Zaugg | 2014-09-05 | 2 | -0/+73 |
| |\ \ \ | |||||
| | * | | | SI-8803 generate super accessor for super[A], if A is outer superclass | Lukas Rytz | 2014-08-20 | 2 | -0/+73 |
| * | | | | Merge pull request #3961 from lrytz/t8786-disable-test | Jason Zaugg | 2014-09-04 | 1 | -1/+3 |
| |\ \ \ \ | |||||
| | * | | | | SI-8786 disable part of test that's failing the jdk8 build | Lukas Rytz | 2014-09-04 | 1 | -1/+3 |
| * | | | | | Merge pull request #3932 from gourlaysama/wip/t8498 | Jason Zaugg | 2014-09-04 | 2 | -4/+7 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-8498 @compileTimeOnly should be aware of bridge methods. | Antoine Gourlay | 2014-08-21 | 2 | -4/+7 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge pull request #3951 from pawel-wiejacha/2.11.x_SI-8810_fix | Grzegorz Kossakowski | 2014-09-03 | 2 | -3/+10 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-8810 scaladoc: fixed code block indentation normalization | Paweł Wiejacha | 2014-09-03 | 2 | -3/+10 |
| * | | | | | | SI-8113 allow a newline between a link target and title | Antoine Gourlay | 2014-09-03 | 2 | -0/+37 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge pull request #3955 from som-snytt/issue/8410 | Grzegorz Kossakowski | 2014-09-03 | 2 | -0/+16 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-8410 Don't warn fatally on disabled flag | Som Snytt | 2014-09-01 | 2 | -0/+16 |
* | | | | | | | Prefer scala.Serializable to j.io.Serializable | Jason Zaugg | 2014-09-06 | 2 | -3/+3 |
* | | | | | | | Merge branch 'merge/2.10-to-2.11-sept-2' into merge/2.11-to-2.12-is-it-really... | Lukas Rytz | 2014-09-02 | 23 | -82/+965 |
|\| | | | | | | |||||
| * | | | | | | Merge commit 'b5759ef' into merge/2.10-to-2.11-sept-2 | Lukas Rytz | 2014-09-02 | 2 | -0/+19 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Prevent SI-8314 by adding a test | Kato Kazuyoshi | 2014-07-31 | 2 | -0/+19 |
| * | | | | | | | Merge pull request #3952 from gourlaysama/wip/t8828-lint-innacessible | Grzegorz Kossakowski | 2014-09-02 | 2 | -0/+21 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | SI-8828 fix regression in Xlint visibility warning for sealed classes | Antoine Gourlay | 2014-08-28 | 2 | -0/+21 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #3948 from retronym/ticket/8823 | Grzegorz Kossakowski | 2014-09-02 | 1 | -0/+10 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-8823 Exclude specialized methods from extension method rewrite | Jason Zaugg | 2014-08-27 | 1 | -0/+10 |
| * | | | | | | | Merge pull request #3931 from lrytz/opt/tracked-final | Lukas Rytz | 2014-09-01 | 9 | -74/+837 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Fix InnerClass / EnclosingMethod attributes | Lukas Rytz | 2014-09-01 | 8 | -40/+816 |
| | * | | | | | | Remove Tracked, add type information to ClassBType | Lukas Rytz | 2014-08-19 | 1 | -34/+21 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge pull request #3949 from lrytz/t8627 | Grzegorz Kossakowski | 2014-08-27 | 2 | -1/+19 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-8627 make Stream.filterNot non-eager | Lukas Rytz | 2014-08-27 | 2 | -1/+19 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #3905 from gourlaysama/wip/t5691-2 | Lukas Rytz | 2014-08-26 | 7 | -7/+59 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | SI-5691 lint warning when a type parameter shadows an existing type. | Antoine Gourlay | 2014-08-12 | 7 | -7/+59 |
* | | | | | | | Merge commit '47908f1' into merge/2.11-to-2.12-is-it-really-sept-2-already-wh... | Lukas Rytz | 2014-09-02 | 100 | -120/+524 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #3929 from retronym/ticket/8793 | Lukas Rytz | 2014-08-26 | 1 | -0/+15 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-8793 Fix patmat regression with extractors, existentials | Jason Zaugg | 2014-08-15 | 1 | -0/+15 |
| * | | | | | | | Merge pull request #3886 from adriaanm/report-filter | Grzegorz Kossakowski | 2014-08-26 | 2 | -1/+10 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Encapsulate reporting mode as class of reportBuffer. | Adriaan Moors | 2014-07-18 | 1 | -1/+9 |
| | * | | | | | | Simplify (ambiguous) error issuing. | Adriaan Moors | 2014-07-17 | 1 | -0/+1 |
| * | | | | | | | Merge pull request #3923 from som-snytt/issue/8787 | Grzegorz Kossakowski | 2014-08-19 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | SI-8787 If you love nulls, so does Regex | Som Snytt | 2014-08-08 | 1 | -0/+17 |
| * | | | | | | | SI-8512 Infer Any for the q | Som Snytt | 2014-08-12 | 2 | -1/+24 |
| * | | | | | | | SI-8512 Infer a type for f"$args" | Som Snytt | 2014-08-12 | 2 | -1/+14 |
| | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #3927 from lrytz/innerClassesTest | Lukas Rytz | 2014-08-12 | 3 | -0/+310 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | test for InnerClass and EnclosingMethod attributes | Lukas Rytz | 2014-08-12 | 3 | -0/+310 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #3902 from gourlaysama/wip/t4563 | Lukas Rytz | 2014-08-12 | 78 | -80/+80 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-4563 friendlier behavior for Ctrl+D in the REPL | Antoine Gourlay | 2014-07-29 | 78 | -80/+80 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #3889 from som-snytt/issue/6476-alt | Lukas Rytz | 2014-08-12 | 3 | -20/+16 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | SI-6476 Documentation | Som Snytt | 2014-07-18 | 2 | -18/+14 |