summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2015...Jason Zaugg2015-07-13175-375/+484
|\
| * Merge pull request #4604 from vergenzt/update-eclipse-filesAdriaan Moors2015-07-063-3/+3
| |\
| | * Update Eclipse classpath entriesTim Vergenz2015-07-043-3/+3
| * | Merge pull request #4605 from janekdb/2.11.x-typos-sDick Wall2015-07-0618-24/+24
| |\ \ | | |/ | |/|
| | * Fix 25 typos (s)Janek Bogucki2015-07-0618-24/+24
| |/
| * Merge pull request #4600 from adriaanm/fixup-4564-checkinitAdriaan Moors2015-07-021-1/+7
| |\
| | * Correct init order between Pasted and ILoop#pastedAdriaan Moors2015-07-021-1/+7
| |/
| * Merge pull request #4596 from janekdb/2.11.x-typos-p-rSeth Tisue2015-07-0121-26/+26
| |\
| | * Fix 27 typos (p-r)Janek Bogucki2015-06-3021-26/+26
| * | Merge pull request #4576 from som-snytt/issue/9206-moreSeth Tisue2015-07-0193-265/+174
| |\ \ | | |/ | |/|
| | * SI-9206 De-perk the welcome messageSom Snytt2015-06-256-40/+68
| | * SI-9206 Update REPL welcome messageSom Snytt2015-06-2486-219/+61
| | * SI-9206 REPL custom continuation promptSom Snytt2015-06-232-7/+15
| | * SI-9206: REPL custom history fileIgor Racic2015-06-231-6/+6
| | * SI-9206: REPL custom welcome messageSom Snytt2015-06-237-17/+51
| | * SI-9206: No REPL message on :silent, unless -Dscala.repl.infoIgor Racic2015-06-232-5/+2
| * | Merge pull request #4569 from retronym/ticket/6985Adriaan Moors2015-06-309-2/+102
| |\ \
| | * | SI-8892 Fix incorrect qualification in error messageJason Zaugg2015-06-233-1/+10
| | * | SI-8777 Avoid redundant disambiguation in error messagesJason Zaugg2015-06-234-3/+14
| | * | SI-6895 Test cases to explain the limitations in tcpoly inferenceJason Zaugg2015-06-234-0/+80
| * | | Merge pull request #4591 from vsalvis/vsalvis-stringdocSeth Tisue2015-06-302-4/+8
| |\ \ \
| | * | | SI-8140 Documentation references java.lang.String directlyvsalvis2015-06-292-4/+8
| * | | | Merge pull request #4588 from retronym/topic/icodishAdriaan Moors2015-06-292-0/+47
| |\ \ \ \
| | * | | | GenBCode: fix incrementatal compilation by mimicing GenASMJason Zaugg2015-06-282-0/+47
| * | | | | Merge pull request #4586 from som-snytt/issue/missing-argsSeth Tisue2015-06-294-21/+55
| |\ \ \ \ \
| | * | | | | Improved message for missing argument listSom Snytt2015-06-274-21/+55
| * | | | | | Merge pull request #4589 from janekdb/2.11.x-method-names-m-oJason Zaugg2015-06-294-8/+8
| |\ \ \ \ \ \
| | * | | | | | Improve method names (m-o)Janek Bogucki2015-06-284-8/+8
| | |/ / / / /
| * | | | | | Merge pull request #4587 from janekdb/2.11.x-typos-m-oDick Wall2015-06-2818-23/+23
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix 23 typos (m-o)Janek Bogucki2015-06-2818-23/+23
| |/ / / / /
* | | | | | Merge pull request #4561 from jdevelop/io-source-fromclasspath-2.12Adriaan Moors2015-07-072-0/+14
|\ \ \ \ \ \
| * | | | | | [ SI-7514 ] Introduce Source.fromClassPath(resource) methodEugene Dzhurinsky2015-07-072-0/+14
* | | | | | | Merge pull request #4603 from lrytz/lambdaSpectestAdriaan Moors2015-07-062-72/+78
|\ \ \ \ \ \ \
| * | | | | | | SI-9373 Restore the test for t8960 with IndyLamba enabledLukas Rytz2015-07-032-72/+78
* | | | | | | | Merge pull request #4606 from lrytz/scalap52Adriaan Moors2015-07-063-0/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Support methodHandle / invokeDynamic constant pool entries in scalapLukas Rytz2015-07-063-0/+22
|/ / / / / / /
* | | | | | | Merge pull request #4601 from som-snytt/issue/9377Lukas Rytz2015-07-033-5/+12
|\ \ \ \ \ \ \
| * | | | | | | SI-9377 Update ScalaVersion error textSom Snytt2015-07-023-5/+6
| * | | | | | | SI-9377 ScalaVersion init no longer fails if versionlessSom Snytt2015-07-022-0/+6
| |/ / / / / /
* | | | | | | Merge pull request #4544 from som-snytt/topic/reporterAdriaan Moors2015-07-027-26/+70
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | SI-9350 Preserve exceptionsSom Snytt2015-07-021-8/+6
| * | | | | | SI-9350 Command option -XreporterSom Snytt2015-06-297-26/+72
* | | | | | | Merge pull request #4599 from lrytz/reifyJFunctionAdriaan Moors2015-07-0217-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix superclass for Java interface symbols created in JavaMirrorsLukas Rytz2015-07-0217-1/+2
|/ / / / / / /
* | | | | | | Merge pull request #4597 from adriaanm/rebase-4594Lukas Rytz2015-07-02193-401/+3480
|\ \ \ \ \ \ \
| * | | | | | | Fix some tests, move others to pending/Lukas Rytz2015-07-0141-323/+94
| * | | | | | | Include sources for scala-java8-compat instead of jarLukas Rytz2015-07-01139-41/+3316
| * | | | | | | Prepare build for inclusion of java8-compatLukas Rytz2015-07-0112-31/+61
| * | | | | | | `deserializeLambda` should not use encoded class nameLukas Rytz2015-07-011-2/+3
| * | | | | | | Java parser: default methods in interfaces are not `DEFERRED`Lukas Rytz2015-07-012-4/+6
|/ / / / / / /