summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.12.0' into merge/2.12.0-to-2.12.xJason Zaugg2016-10-1413-109/+146
|\
| * Detect clash of mixedin val and existing member.Adriaan Moors2016-10-122-14/+20
| * Merge pull request #5429 from lrytz/sd224Adriaan Moors2016-10-117-18/+41
| |\
| | * Default -Xmixin-force-forwarders to trueLukas Rytz2016-09-302-6/+7
| | * Explicit SerialVersionUID for all ClassTags / ManifestsLukas Rytz2016-09-304-10/+32
| | * Error message for super calls to indirect java parent interfacesLukas Rytz2016-09-301-2/+2
| * | Merge pull request #5442 from adriaanm/t9943Adriaan Moors2016-10-111-2/+2
| |\ \
| | * | SI-9943 final/sealed class does not yield SAM typeAdriaan Moors2016-10-041-2/+2
| | |/
| * | Merge pull request #5452 from lrytz/sd242Adriaan Moors2016-10-101-2/+1
| |\ \
| | * | Fix the interface flag when re-writing a closure call to the body methodLukas Rytz2016-10-091-2/+1
| | |/
| * | SI-9946 don't null field in lazy accessors that turn out to be liveJason Zaugg2016-10-074-73/+82
| * | SI-9946 make nullification of lazy val dependencies module awareJason Zaugg2016-10-071-1/+1
| |/
* | Merge pull request #5416 from SethTisue/merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-10-0516-157/+204
|\|
| * Merge pull request #5430 from adriaanm/dev235Adriaan Moors2016-09-293-48/+49
| |\
| | * Clarify docs, variable nameAdriaan Moors2016-09-291-11/+12
| | * Emit local module like lazy valAdriaan Moors2016-09-291-22/+20
| | * Make some name suffixes constantsAdriaan Moors2016-09-282-18/+20
| * | don't deprecate Either.left and Either.right yetSeth Tisue2016-09-281-15/+13
| * | Merge pull request #5423 from lrytz/sd229Adriaan Moors2016-09-283-12/+35
| |\ \
| | * | SI-4683 fix $outer accesses in class bodies extending DelayedInitLukas Rytz2016-09-281-1/+1
| | * | SI-9697 / SD-229 Fix DelayedInit subclass capturing local valueLukas Rytz2016-09-282-11/+34
| * | | Merge pull request #5397 from retronym/ticket/9920Adriaan Moors2016-09-282-2/+9
| |\ \ \ | | |_|/ | |/| |
| | * | SI-9920 Avoid linkage errors with captured local objects + self typesJason Zaugg2016-09-272-2/+9
| * | | Merge pull request #5412 from retronym/ticket/SD-226Adriaan Moors2016-09-282-1/+19
| |\ \ \
| | * | | Make isSeparateCompiled... robust against rogue phase time travelJason Zaugg2016-09-272-3/+9
| | * | | SD-226 Be lazier in Fields info transform for better performanceJason Zaugg2016-09-212-1/+13
| | | |/ | | |/|
| * | | Merge pull request #5388 from adriaanm/issue-219Adriaan Moors2016-09-281-42/+66
| |\ \ \
| | * | | Cast more pro-actively in synthetic accessor trees.Adriaan Moors2016-09-261-51/+62
| | * | | Avoid mismatched symbols in fields phaseAdriaan Moors2016-09-261-2/+15
| | |/ /
| * | | Including Lightbend in `-version` message.Adriaan Moors2016-09-271-1/+1
| * | | Merge pull request #5417 from retronym/ticket/SD-233Jason Zaugg2016-09-271-1/+3
| |\ \ \
| | * | | SD-233 synchronized blocks are JIT-friendly againJason Zaugg2016-09-271-1/+3
| | |/ /
| * / / Optimize javaBinaryName callersJason Zaugg2016-09-263-5/+5
| |/ /
| * | Merge pull request #5380 from SethTisue/remove-outdated-ensime-stuffLukas Rytz2016-09-202-28/+0
| |\ \ | | |/ | |/|
| | * remove outdated ENSIME infoSeth Tisue2016-09-072-28/+0
| * | Merge pull request #5395 from retronym/pr/5394Jason Zaugg2016-09-151-1/+1
| |\ \
| | * | Avoid omitting constant typed vals in constructorsJason Zaugg2016-09-121-1/+1
| | |/
| * | Merge pull request #5398 from retronym/ticket/SD-225Jason Zaugg2016-09-151-2/+4
| |\ \
| | * | SD-225 Use a "lzycompute" method for module initializationJason Zaugg2016-09-141-2/+4
| | |/
| * / SI-9918 object in trait mixed into package objectAdriaan Moors2016-09-101-1/+1
| |/
* | Merge pull request #5420 from SethTisue/ah-sbaz-those-were-the-daysLukas Rytz2016-09-301-5/+2
|\ \
| * | expunge a stray reference to sbaz in the Scala man pageSeth Tisue2016-09-261-5/+2
| |/
* / SI-9936 SeqLike.indexWhere starts at zeroSom Snytt2016-09-261-1/+1
|/
* Merge pull request #5368 from retronym/ticket/SD-208Adriaan Moors2016-09-062-32/+10
|\
| * SD-208 Restore 2.11 names for arrayOps implicitsJason Zaugg2016-08-312-32/+10
* | SD-143 allow super calls to methods defined in indirect super classesJason Zaugg2016-09-051-1/+7
* | Merge pull request #5311 from szeiger/wip/raidAdriaan Moors2016-09-0516-518/+0
|\ \
| * | Remove the ant buildStefan Zeiger2016-09-0216-518/+0
* | | More elegant holders for local lazy vals.Adriaan Moors2016-09-023-44/+144
|/ /
* | Merge pull request #5369 from lrytz/sd210Lukas Rytz2016-09-0212-68/+126
|\ \