Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | [backport] SI-9616 False positive in unused import warning | Som Snytt | 2016-01-07 | 4 | -24/+96 |
* | | | | | | | | Merge commit 'bf599bc' into merge/2.11.x-to-2.12.x-20160203 | Jason Zaugg | 2016-02-03 | 31 | -60/+365 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Merge pull request #4905 from SethTisue/disable-flaky-prezzy-test-on-windows | Jason Zaugg | 2016-01-18 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | disable flaky presentation compiler test on Windows | Seth Tisue | 2016-01-15 | 1 | -0/+6 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #4910 from grimreaper/eax/spelling/earlythe | Jason Zaugg | 2016-01-18 | 10 | -13/+13 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Fix some simple extra words | Eitan Adler | 2016-01-17 | 10 | -13/+13 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #4886 from janekdb/2.11.x-scaladoc-Duration-links | Seth Tisue | 2016-01-14 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix Scaladoc overloaded method link to Duration companion object | Janek Bogucki | 2016-01-04 | 1 | -2/+2 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #4902 from ruippeixotog/issue/9605 | Seth Tisue | 2016-01-13 | 2 | -6/+54 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-9605 Searching does not use binary search for Array | Rui Gonçalves | 2016-01-12 | 2 | -6/+54 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #4892 from linasm/si-8641-2.11 | Seth Tisue | 2016-01-13 | 5 | -20/+20 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | SI-8641 Fix right shift docs for integer types | Linas Medziunas | 2016-01-03 | 5 | -20/+20 |
| |/ / / / | |||||
| * | | | | Merge pull request #4765 from janekdb/2.11.x-scaladoc-diff | Seth Tisue | 2015-12-18 | 1 | -0/+117 |
| |\ \ \ \ | |||||
| | * | | | | Enhance scaladoc-diff tool for Ubuntu. | Janek Bogucki | 2015-10-03 | 1 | -27/+73 |
| | * | | | | Script to compare the current scaladoc with the parent commit's doc | Janek Bogucki | 2015-09-30 | 1 | -0/+71 |
| * | | | | | Merge pull request #4862 from retronym/ticket/9567 | Lukas Rytz | 2015-12-18 | 5 | -4/+82 |
| |\ \ \ \ \ |