Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'cf38506' into merge/2.11.x-to-2.12.x-20160511 | Jason Zaugg | 2016-05-11 | 0 | -0/+0 |
|\ | |||||
| * | Merge pull request #5139 from SethTisue/disable-integrate-ide | Adriaan Moors | 2016-04-28 | 1 | -0/+4 |
| |\ | |||||
| | * | disable integrate/ide script on 2.11.x | Seth Tisue | 2016-04-28 | 1 | -0/+4 |
* | | | Merge pull request #5042 from soc/SI-9539 | Jason Zaugg | 2016-05-05 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | SI-9539 Specify charset when reading ScalaSignatures, ... | Simon Ochsenreither | 2016-03-15 | 1 | -2/+2 |
* | | | | Merge pull request #5083 from xuwei-k/fix-Future-scaladoc | Jason Zaugg | 2016-05-05 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | use Future#foreach instead of onSuccess in example code | xuwei-k | 2016-04-14 | 1 | -2/+2 |
* | | | | | Merge pull request #5112 from lrytz/dropRecursiveClasspath | Jason Zaugg | 2016-05-05 | 34 | -1200/+380 |
|\ \ \ \ \ | |||||
| * | | | | | Remove abstraction layer in classpath implementation | Lukas Rytz | 2016-05-02 | 33 | -440/+339 |
| * | | | | | faster AggregateClassPath.findClass | Lukas Rytz | 2016-04-23 | 1 | -13/+12 |
| * | | | | | remove recursive classpath implementation | Lukas Rytz | 2016-04-23 | 24 | -803/+85 |
* | | | | | | Merge pull request #5132 from acdenhartog/patch-1 | Jason Zaugg | 2016-05-05 | 2 | -3/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test PriorityQueue.reverse | Arno den Hartog | 2016-05-02 | 1 | -0/+7 |
| * | | | | | | Avoid function chaining with reverse method | Arno den Hartog | 2016-04-27 | 1 | -3/+1 |
* | | | | | | | Merge pull request #5140 from lrytz/inlineDefaultMethods | Jason Zaugg | 2016-05-05 | 8 | -65/+200 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SD-140 inline the correct default method | Lukas Rytz | 2016-04-28 | 8 | -65/+200 |
| |/ / / / / / | |||||
* | | | | | | | Emit a warning when a constant expression evaluates to an ArithmeticException... | Olli Helenius | 2016-05-02 | 5 | -7/+15 |
* | | | | | | | SI-9752 never ignore blank lines when parsing code blocks (#5125) | Antoine Gourlay | 2016-05-02 | 3 | -1/+34 |
* | | | | | | | SD-142 Avoid noisy log output in backend (#5134) | Jason Zaugg | 2016-05-02 | 2 | -6/+9 |
* | | | | | | | Add examples to Exception object and group members (#5111) | Janek Bogucki | 2016-05-02 | 1 | -25/+165 |
* | | | | | | | Merge pull request #5129 from retronym/ticket/9762 | Jason Zaugg | 2016-04-29 | 3 | -29/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-9762 Remove workaround after upstream fix in jline | Jason Zaugg | 2016-04-27 | 1 | -20/+0 |
| * | | | | | | | SI-9762 Update to JLine 2.14.1 | Jason Zaugg | 2016-04-27 | 3 | -9/+11 |
| |/ / / / / / | |||||
* | | | | | | | Fix the Eclipse classpaths for 2.12.0-M4. (#5136) | Performant Data | 2016-04-28 | 3 | -5/+5 |
* | | | | | | | Merge pull request #5094 from lrytz/classOfUnit | Adriaan Moors | 2016-04-27 | 2 | -2/+15 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix erasure for classOf[Unit], don't erase to classOf[BoxedUnit] | Lukas Rytz | 2016-04-20 | 2 | -2/+15 |
* | | | | | | | More efficient code for deciding if a mixin forwarder is needed (#5116) | Lukas Rytz | 2016-04-25 | 8 | -16/+42 |
* | | | | | | | Merge pull request #5115 from lrytz/merge-2.11-to-2.12-apr-22 | Lukas Rytz | 2016-04-25 | 16 | -35/+193 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge commit '2dd311f' into merge-2.11-to-2.12-apr-22 | Lukas Rytz | 2016-04-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | CI: hardcode java path in integrate/windows script | Adriaan Moors | 2016-04-21 | 1 | -5/+6 |
| | * | | | | | | Merge pull request #5113 from adriaanm/ci-win-java6 | Adriaan Moors | 2016-04-21 | 1 | -0/+3 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | CI: use java 6 for windows integration | Adriaan Moors | 2016-04-21 | 1 | -0/+3 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge commit '684c314' into merge-2.11-to-2.12-apr-22 | Lukas Rytz | 2016-04-22 | 7 | -6/+90 |
| |\| | | | | | | |||||
| | * | | | | | | SI-9734 Narrow type when import REPL history (#5084) | som-snytt | 2016-04-20 | 3 | -1/+41 |
| | * | | | | | | SI-9735 REPL prefer standard escapes for code text (#5086) | som-snytt | 2016-04-20 | 3 | -4/+48 |
| | * | | | | | | Updating README.md Eclipse version reference. (#5092) | CodingTwinky | 2016-04-20 | 1 | -1/+1 |
| * | | | | | | | Merge commit '23159d2' into merge-2.11-to-2.12-apr-22 | Lukas Rytz | 2016-04-22 | 9 | -29/+103 |
| |\| | | | | | | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Automate Eclipse settings and update project files: (#5091) | Iulian Dragos | 2016-04-20 | 9 | -27/+101 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge pull request #5109 from lrytz/pr5064 | Lukas Rytz | 2016-04-23 | 73 | -503/+873 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rename the (deprecated) implicit conversion methods in JavaConversions | Lukas Rytz | 2016-04-22 | 4 | -2/+59 |
| * | | | | | | Cleaned up Scaladoc for JavaConverters and non-deprecated friends | Lukas Rytz | 2016-04-22 | 7 | -872/+261 |
| * | | | | | | SI-9684 Deprecate JavaConversions | Som Snytt | 2016-04-22 | 71 | -152/+1076 |
| |/ / / / / | |||||
* / / / / / | SI-9516 Fix the behavior of Int shift Long operations. (#5117) | Sébastien Doeraene | 2016-04-23 | 3 | -7/+60 |
|/ / / / / | |||||
* | | | | | CI: hardcode java path in integrate/windows script | Adriaan Moors | 2016-04-21 | 1 | -7/+7 |
* | | | | | Merge pull request #5110 from sjrd/remove-duplicate-implem-of-hashcodes | Lukas Rytz | 2016-04-22 | 11 | -108/+74 |
|\ \ \ \ \ | |||||
| * | | | | | Remove the duplicate implem of hash codes for numbers. | Sébastien Doeraene | 2016-04-21 | 12 | -103/+61 |
| * | | | | | Bring Statics.doubleHash in sync with BoxesRunTime.hashFromDouble. | Sébastien Doeraene | 2016-04-21 | 2 | -13/+21 |
* | | | | | | CI: fix integrate-windows script | Adriaan Moors | 2016-04-21 | 1 | -1/+1 |
* | | | | | | Merge pull request #5114 from adriaanm/ci-win-java8 | Adriaan Moors | 2016-04-21 | 1 | -5/+5 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | CI: use java 8 for windows integration | Adriaan Moors | 2016-04-21 | 1 | -5/+5 |
|/ / / / / |