summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge 2.11.x into 2.12.xAdriaan Moors2017-04-074-21/+43
|\
| * Merge pull request #5736 from adriaanm/t10206Adriaan Moors2017-03-214-21/+43
| |\
| | * Test case for SI-10206Jason Zaugg2017-03-021-0/+15
| | * SI-10206 tighten fix for SI-6889Adriaan Moors2017-02-233-21/+28
* | | Merge 2.11.x into 2.12.xAdriaan Moors2017-04-070-0/+0
|\| |
| * | Merge pull request #5781 from lrytz/2.11.xLukas Rytz2017-03-161-2/+1
| |\ \
| | * | update stale commentLukas Rytz2017-03-161-2/+1
| |/ /
| * | Merge pull request #5764 from lrytz/bootstrap-2.11Lukas Rytz2017-03-094-72/+103
| |\ \
| | * | [backport] new repo, version numbers for integration buildsLukas Rytz2017-03-094-72/+103
| |/ /
* | | Merge 2.11.x into 2.12.xAdriaan Moors2017-04-076-8/+8
|\| |
| * | Merge pull request #5753 from Philippus/issue/copyright_yearSeth Tisue2017-03-067-9/+9
| |\ \
| | * | bump copyright year to 2017Philippus Baalman2017-03-027-9/+9
| | |/
* | | Merge 2.11.x into 2.12.xAdriaan Moors2017-04-070-0/+0
|\| |
| * | Merge pull request #5730 from adriaanm/userdefined-apply-211Adriaan Moors2017-03-026-23/+242
| |\ \ | | |/ | |/|
| | * Improvements based on reviews by Lukas & JasonAdriaan Moors2017-03-026-24/+107
| | * Clarify spec of interaction of existing vs synthetic apply/unapplyAdriaan Moors2017-02-281-11/+10
| | * Allow user-defined `[un]apply` in case companionAdriaan Moors2017-02-274-12/+149
| |/
* | Merge 2.11.x into 2.12.xAdriaan Moors2017-04-071-1/+1
|\|
| * Merge pull request #5699 from SethTisue/mima-0.1.14Seth Tisue2017-02-172-2/+2
| |\
| | * upgrade to MiMa 0.1.14Seth Tisue2017-02-142-2/+2
* | | Merge 2.11.x into 2.12.xAdriaan Moors2017-04-070-0/+0
|\| |
| * | Merge pull request #5705 from SethTisue/readme-ant-tweakAdriaan Moors2017-02-161-1/+1
| |\ \
| | * | update Ant version info in readmeSeth Tisue2017-02-151-1/+1
| * | | More reusable path for windows jobAdriaan Moors2017-02-151-3/+2
| |/ /
* | | Merge pull request #5835 from lrytz/t5717-testLukas Rytz2017-04-072-1/+2
|\ \ \
| * | | t5717: test message, not just absence of compiler crashLukas Rytz2017-04-072-1/+2
* | | | Update README.mdAdriaan Moors2017-04-071-1/+1
* | | | Bye bye JIRAAdriaan Moors2017-04-071-2/+1
|/ / /
* | | Merge pull request #5811 from milessabin/topic/implicitinfo-hashcodeJason Zaugg2017-04-052-1/+43
|\ \ \
| * | | Make ImplicitInfo hashCode consistent with equals.Miles Sabin2017-04-032-1/+43
* | | | Merge pull request #5773 from wpopielarski/2.12.xAdriaan Moors2017-04-042-1/+13
|\ \ \ \
| * | | | Adds three Java 8 new Constant Pool structures to scalap.wpopielarski2017-03-132-1/+13
* | | | | Merge pull request #5813 from viktorklang/wip-improve-await-docs-√Seth Tisue2017-04-042-26/+59
|\ \ \ \ \
| * | | | | Improving ScalaDoc for ExecutionContext and Await.Viktor Klang2017-03-292-26/+59
| | |/ / / | |/| | |
* | | | | Merge pull request #5817 from ashawley/java-converters-typoSeth Tisue2017-03-311-6/+6
|\ \ \ \ \
| * | | | | Fix typo in JavaConverters docAaron S. Hawley2017-03-311-6/+6
* | | | | | Merge pull request #5802 from jrudolph/jr/w/ListBuffer-isEmpty-nonEmptyLukas Rytz2017-03-301-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Implement ListBuffer.isEmpty / nonEmpty efficientlyJohannes Rudolph2017-03-271-0/+4
* | | | | | Merge pull request #5724 from jvican/stub-errors-2.12.xAdriaan Moors2017-03-2728-35/+462
|\ \ \ \ \ \
| * | | | | | Improve stub error messages (SCP-009 proposal)jvican2017-03-2428-35/+462
* | | | | | | Merge pull request #5803 from pfcoperez/updatedprocdocsLukas Rytz2017-03-241-4/+3
|\ \ \ \ \ \ \
| * | | | | | | `def run(log: ProcessLogger, connectInput: Boolean): Process` doesn't block u...Pablo Fco. Pérez Hidalgo2017-03-241-4/+3
|/ / / / / / /
* | | | | | | Merge pull request #5778 from som-snytt/issue/10225som-snytt2017-03-231-331/+283
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | SI-10225 Either evinces good styleSom Snytt2017-03-211-58/+54
| * | | | | | SI-10225 Either docs compileSom Snytt2017-03-141-317/+273
* | | | | | | Merge pull request #5797 from jrudolph/patch-1Lukas Rytz2017-03-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Improve List creation in BatchingExecutorJohannes Rudolph2017-03-221-1/+1
* | | | | | | | Merge pull request #5783 from lrytz/t10231Adriaan Moors2017-03-223-7/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-10231 Skip outer parameter when classfile parsing java param namesLukas Rytz2017-03-173-7/+33
* | | | | | | | | Merge pull request #5643 from som-snytt/issue/8417Adriaan Moors2017-03-225-18/+42
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |