Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4938 from retronym/ticket/9349 | Jason Zaugg | 2016-02-10 | 3 | -3/+25 |
|\ | |||||
| * | SI-9349 Fix use of patmat binder as prefix for new x.Inner | Jason Zaugg | 2016-02-02 | 3 | -3/+25 |
* | | Merge pull request #4868 from retronym/ticket/9542-combo | Jason Zaugg | 2016-02-10 | 5 | -24/+56 |
|\ \ | |||||
| * | | SI-9542 Unify different reprs. of module type refs | Jason Zaugg | 2016-02-01 | 4 | -23/+52 |
| * | | SI-9542 Fix regression in value classes with enclosing refs | Jason Zaugg | 2016-02-01 | 1 | -1/+4 |
* | | | Merge pull request #4952 from felixmulder/topic/scaladoc-hideImplicitConversi... | Vlad Ureche | 2016-02-09 | 7 | -70/+132 |
|\ \ \ | |||||
| * | | | SI-9620: add doc annotation to hide specific conversions | Felix Mulder | 2016-02-09 | 7 | -70/+132 |
|/ / / | |||||
* | | | Merge pull request #4948 from szeiger/issue/9574 | Stefan Zeiger | 2016-02-09 | 3 | -6/+27 |
|\ \ \ | |||||
| * | | | SI-9574 Prevent illegal overrides of members with module types | Stefan Zeiger | 2016-02-08 | 3 | -6/+27 |
* | | | | Merge pull request #4949 from felixmulder/topic/scaladoc-fix-implicits-array | Vlad Ureche | 2016-02-06 | 1 | -0/+11 |
|\ \ \ \ | |||||
| * | | | | Scaladoc: fix duplicate implicits in Array | Felix Mulder | 2016-02-06 | 1 | -0/+11 |
|/ / / / | |||||
* | | | | Merge pull request #4946 from felixmulder/topic/scaladoc-panzoom-graphs | Vlad Ureche | 2016-02-06 | 10 | -155/+193 |
|\ \ \ \ | |||||
| * | | | | Add panzoom feature to Type Inheritance graphs | Felix Mulder | 2016-02-06 | 10 | -155/+193 |
|/ / / / | |||||
* | | | | Merge pull request #4947 from felixmulder/topic/scaladoc-fix-stray-number | Vlad Ureche | 2016-02-06 | 1 | -0/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Scaladoc: fix stray number in codeblocks for firefox | Felix Mulder | 2016-02-05 | 1 | -0/+4 |
|/ / / | |||||
* | | | Merge pull request #4941 from retronym/merge/2.11.x-to-2.12.x-20160203 | Jason Zaugg | 2016-02-05 | 52 | -195/+679 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/2.12.x' into merge/2.11.x-to-2.12.x-2016... | Jason Zaugg | 2016-02-04 | 78 | -525/+935 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #4940 from lrytz/partestUpgrade | Seth Tisue | 2016-02-03 | 6 | -2/+14 |
|\ \ \ \ | |||||
| * | | | | Update partest to 1.0.12, test case for reporting invalid flags | Lukas Rytz | 2016-02-03 | 7 | -3/+15 |
* | | | | | Merge pull request #4920 from lrytz/oldOptimizerTests | Lukas Rytz | 2016-02-03 | 51 | -394/+595 |
|\ \ \ \ \ | |||||
| * | | | | | Re-write and Re-enable optimizer tests | Lukas Rytz | 2016-02-03 | 47 | -256/+421 |
| * | | | | | show erroneous compiler flags in junit compiler tests | Lukas Rytz | 2016-02-03 | 1 | -2/+4 |
| * | | | | | rename -YoptTrace to -Yopt-trace | Lukas Rytz | 2016-02-03 | 1 | -1/+1 |
| * | | | | | Improve simplifyJumps | Lukas Rytz | 2016-02-03 | 2 | -135/+169 |
* | | | | | | Merge pull request #4737 from soc/SI-9315 | Lukas Rytz | 2016-02-03 | 6 | -21/+101 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-9315 Desugar string concat to java.lang.StringBuilder ... | Simon Ochsenreither | 2016-02-03 | 6 | -21/+101 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4904 from Ichoran/reusable-builders | Lukas Rytz | 2016-02-03 | 15 | -108/+225 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Clarified and expanded which Builders were reusable | Rex Kerr | 2016-01-30 | 15 | -108/+225 |
| | |_|/ / | |/| | | | |||||
| | | * | | Merge commit 'cc6fea6' into merge/2.11.x-to-2.12.x-20160203 | Jason Zaugg | 2016-02-04 | 23 | -136/+315 |
| | | |\ \ | |||||
| | | | * \ | Merge pull request #4927 from szeiger/issue/9572 | Jason Zaugg | 2016-02-01 | 5 | -35/+71 |
| | | | |\ \ | |||||
| | | | | * | | SI-9572 Check for illegal tuple sizes in the parser | Stefan Zeiger | 2016-01-28 | 5 | -35/+71 |
| | | | * | | | Merge pull request #4922 from SethTisue/fix-cla-links | Jason Zaugg | 2016-02-01 | 2 | -2/+2 |
| | | | |\ \ \ | |||||
| | | | | * | | | fix broken links to Scala CLA | Seth Tisue | 2016-01-27 | 2 | -2/+2 |
| | | | * | | | | Merge pull request #4921 from szeiger/issue/9534 | Jason Zaugg | 2016-02-01 | 2 | -1/+14 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | SI-9534 Use BoxedUnit in all cases for creating Array[Unit] | Stefan Zeiger | 2016-01-27 | 2 | -1/+14 |
| | | | | | |/ / | | | | | |/| | | |||||
| | | | * | | | | Merge pull request #4932 from SethTisue/readme-tweak | Seth Tisue | 2016-01-29 | 1 | -1/+1 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | tweak my own entry in the readme | Seth Tisue | 2016-01-29 | 1 | -1/+1 |
| | | | |/ / / / | |||||
| | | | * | | | | Merge pull request #4884 from szeiger/wip/sbt-pr-validation | Seth Tisue | 2016-01-29 | 7 | -68/+121 |
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | | * | | | Use sbt for PR validation builds. | Stefan Zeiger | 2016-01-12 | 7 | -68/+121 |
| | | | * | | | | Merge pull request #4891 from janekdb/2.11.x-CommentFactoryBase-mix-1 | Lukas Rytz | 2016-01-26 | 3 | -18/+85 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Trim complexity in CommentFactoryBase | Janek Bogucki | 2016-01-25 | 3 | -18/+85 |
| | | | | | |/ / | | | | | |/| | | |||||
| | | | * | | | | Merge pull request #4913 from szeiger/wip/sbt-windows-fixes | Lukas Rytz | 2016-01-26 | 3 | -12/+20 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Improved EOL handling for scripts generated by the sbt build | Stefan Zeiger | 2016-01-25 | 1 | -9/+10 |
| | | | | * | | | | Use portable Java APIs instead of calling chmod from sbt | Stefan Zeiger | 2016-01-25 | 1 | -3/+4 |
| | | | | * | | | | Use Windows classpath in sh scripts when building in sbt on Windows | Stefan Zeiger | 2016-01-21 | 1 | -4/+10 |
| | | | | * | | | | Normalize Windows paths when calling JarJar from the sbt build | Stefan Zeiger | 2016-01-14 | 1 | -2/+2 |
| | | | * | | | | | Merge pull request #4918 from raboof/patch-1 | Lukas Rytz | 2016-01-25 | 1 | -0/+2 |
| | | | |\ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | |||||
| | | | | * | | | | Link 'Future' scaladoc to 'Futures and Promises' | Arnout Engelen | 2016-01-25 | 1 | -0/+2 |
| | | | |/ / / / | |||||
| | | | * | | | | Merge pull request #4899 from som-snytt/issue/9616 | Jason Zaugg | 2016-01-19 | 4 | -24/+96 |
| | | | |\ \ \ \ | |||||
| | | * | \ \ \ \ | Merge commit '8c50d84' into merge/2.11.x-to-2.12.x-20160203 | Jason Zaugg | 2016-02-03 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | |