Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2015... | Jason Zaugg | 2015-07-13 | 175 | -375/+484 |
|\ | |||||
| * | Merge pull request #4604 from vergenzt/update-eclipse-files | Adriaan Moors | 2015-07-06 | 3 | -3/+3 |
| |\ | |||||
| | * | Update Eclipse classpath entries | Tim Vergenz | 2015-07-04 | 3 | -3/+3 |
| * | | Merge pull request #4605 from janekdb/2.11.x-typos-s | Dick Wall | 2015-07-06 | 18 | -24/+24 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix 25 typos (s) | Janek Bogucki | 2015-07-06 | 18 | -24/+24 |
| |/ | |||||
| * | Merge pull request #4600 from adriaanm/fixup-4564-checkinit | Adriaan Moors | 2015-07-02 | 1 | -1/+7 |
| |\ | |||||
| | * | Correct init order between Pasted and ILoop#pasted | Adriaan Moors | 2015-07-02 | 1 | -1/+7 |
| |/ | |||||
| * | Merge pull request #4596 from janekdb/2.11.x-typos-p-r | Seth Tisue | 2015-07-01 | 21 | -26/+26 |
| |\ | |||||
| | * | Fix 27 typos (p-r) | Janek Bogucki | 2015-06-30 | 21 | -26/+26 |
| * | | Merge pull request #4576 from som-snytt/issue/9206-more | Seth Tisue | 2015-07-01 | 93 | -265/+174 |
| |\ \ | | |/ | |/| | |||||
| | * | SI-9206 De-perk the welcome message | Som Snytt | 2015-06-25 | 6 | -40/+68 |
| | * | SI-9206 Update REPL welcome message | Som Snytt | 2015-06-24 | 86 | -219/+61 |
| | * | SI-9206 REPL custom continuation prompt | Som Snytt | 2015-06-23 | 2 | -7/+15 |
| | * | SI-9206: REPL custom history file | Igor Racic | 2015-06-23 | 1 | -6/+6 |
| | * | SI-9206: REPL custom welcome message | Som Snytt | 2015-06-23 | 7 | -17/+51 |
| | * | SI-9206: No REPL message on :silent, unless -Dscala.repl.info | Igor Racic | 2015-06-23 | 2 | -5/+2 |
| * | | Merge pull request #4569 from retronym/ticket/6985 | Adriaan Moors | 2015-06-30 | 9 | -2/+102 |
| |\ \ | |||||
| | * | | SI-8892 Fix incorrect qualification in error message | Jason Zaugg | 2015-06-23 | 3 | -1/+10 |
| | * | | SI-8777 Avoid redundant disambiguation in error messages | Jason Zaugg | 2015-06-23 | 4 | -3/+14 |
| | * | | SI-6895 Test cases to explain the limitations in tcpoly inference | Jason Zaugg | 2015-06-23 | 4 | -0/+80 |
| * | | | Merge pull request #4591 from vsalvis/vsalvis-stringdoc | Seth Tisue | 2015-06-30 | 2 | -4/+8 |
| |\ \ \ | |||||
| | * | | | SI-8140 Documentation references java.lang.String directly | vsalvis | 2015-06-29 | 2 | -4/+8 |
| * | | | | Merge pull request #4588 from retronym/topic/icodish | Adriaan Moors | 2015-06-29 | 2 | -0/+47 |
| |\ \ \ \ | |||||
| | * | | | | GenBCode: fix incrementatal compilation by mimicing GenASM | Jason Zaugg | 2015-06-28 | 2 | -0/+47 |
| * | | | | | Merge pull request #4586 from som-snytt/issue/missing-args | Seth Tisue | 2015-06-29 | 4 | -21/+55 |
| |\ \ \ \ \ | |||||
| | * | | | | | Improved message for missing argument list | Som Snytt | 2015-06-27 | 4 | -21/+55 |
| * | | | | | | Merge pull request #4589 from janekdb/2.11.x-method-names-m-o | Jason Zaugg | 2015-06-29 | 4 | -8/+8 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Improve method names (m-o) | Janek Bogucki | 2015-06-28 | 4 | -8/+8 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #4587 from janekdb/2.11.x-typos-m-o | Dick Wall | 2015-06-28 | 18 | -23/+23 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Fix 23 typos (m-o) | Janek Bogucki | 2015-06-28 | 18 | -23/+23 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4561 from jdevelop/io-source-fromclasspath-2.12 | Adriaan Moors | 2015-07-07 | 2 | -0/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [ SI-7514 ] Introduce Source.fromClassPath(resource) method | Eugene Dzhurinsky | 2015-07-07 | 2 | -0/+14 |
* | | | | | | | Merge pull request #4603 from lrytz/lambdaSpectest | Adriaan Moors | 2015-07-06 | 2 | -72/+78 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-9373 Restore the test for t8960 with IndyLamba enabled | Lukas Rytz | 2015-07-03 | 2 | -72/+78 |
* | | | | | | | | Merge pull request #4606 from lrytz/scalap52 | Adriaan Moors | 2015-07-06 | 3 | -0/+22 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Support methodHandle / invokeDynamic constant pool entries in scalap | Lukas Rytz | 2015-07-06 | 3 | -0/+22 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4601 from som-snytt/issue/9377 | Lukas Rytz | 2015-07-03 | 3 | -5/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-9377 Update ScalaVersion error text | Som Snytt | 2015-07-02 | 3 | -5/+6 |
| * | | | | | | | SI-9377 ScalaVersion init no longer fails if versionless | Som Snytt | 2015-07-02 | 2 | -0/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #4544 from som-snytt/topic/reporter | Adriaan Moors | 2015-07-02 | 7 | -26/+70 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | SI-9350 Preserve exceptions | Som Snytt | 2015-07-02 | 1 | -8/+6 |
| * | | | | | | SI-9350 Command option -Xreporter | Som Snytt | 2015-06-29 | 7 | -26/+72 |
* | | | | | | | Merge pull request #4599 from lrytz/reifyJFunction | Adriaan Moors | 2015-07-02 | 17 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix superclass for Java interface symbols created in JavaMirrors | Lukas Rytz | 2015-07-02 | 17 | -1/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4597 from adriaanm/rebase-4594 | Lukas Rytz | 2015-07-02 | 193 | -401/+3480 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix some tests, move others to pending/ | Lukas Rytz | 2015-07-01 | 41 | -323/+94 |
| * | | | | | | | Include sources for scala-java8-compat instead of jar | Lukas Rytz | 2015-07-01 | 139 | -41/+3316 |
| * | | | | | | | Prepare build for inclusion of java8-compat | Lukas Rytz | 2015-07-01 | 12 | -31/+61 |
| * | | | | | | | `deserializeLambda` should not use encoded class name | Lukas Rytz | 2015-07-01 | 1 | -2/+3 |
| * | | | | | | | Java parser: default methods in interfaces are not `DEFERRED` | Lukas Rytz | 2015-07-01 | 2 | -4/+6 |
|/ / / / / / / |