summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4732 from SethTisue/merge-2.11.x-sep-8Adriaan Moors2015-09-0945-66/+193
|\
| * Merge remote-tracking branch 'origin/2.11.x' into 2.12.xSeth Tisue2015-09-0845-66/+193
* | Merge pull request #4731 from soc/SI-7155Seth Tisue2015-09-081-250/+0
|\ \ | |/ |/|
| * SI-7155 Remove deprecated private s.c.m.AVLTreeSimon Ochsenreither2015-09-051-250/+0
* | Merge pull request #4709 from adriaanm/namers-accessorsJason Zaugg2015-09-085-80/+99
|\ \
| * | Review feedback from retronymAdriaan Moors2015-09-021-2/+3
| * | Simplify decision whether to derive accessorsAdriaan Moors2015-09-023-27/+19
| * | Streamline MethodSynthesis & NamersAdriaan Moors2015-09-024-58/+84
* | | Merge pull request #4671 from lrytz/t9375-easyJason Zaugg2015-09-083-17/+9
|\ \ \
| * | | SI-9375 add synthetic readResolve only for static modulesLukas Rytz2015-07-301-0/+1
| * | | Cleanup in RefchecksLukas Rytz2015-07-243-17/+8
* | | | Merge pull request #4673 from puffnfresh/issue/6806Jason Zaugg2015-09-087-47/+102
|\ \ \ \ | |_|_|/ |/| | |
| * | | SI-6806 Add an @implicitAmbiguous annotationBrian McKenna2015-08-117-47/+102
* | | | Merge pull request #4718 from Ichoran/issue/9379Seth Tisue2015-09-022-0/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | SI-9379 Added toString to .zipped to allow Stream etc to short-circuitRex Kerr2015-08-302-0/+4
* | | | Merge pull request #4691 from nicolasstucki/2.12.x-ScalaRunntime-fix-for-Scal...Adriaan Moors2015-08-311-4/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unnecessary dependency on parallel collections in ScalaRunTime.Nicolas Stucki2015-08-201-4/+2
| |/ /
* | | SI-9381 remove last vestiges of sun.misc.UnsafeSeth Tisue2015-08-271-38/+0
* | | Uncurry does Literal RHS for ConstantType def, not ConstructorsAdriaan Moors2015-08-242-16/+18
* | | Clean up Constructors a bit.Adriaan Moors2015-08-241-96/+90
* | | Merge pull request #4590 from som-snytt/issue/6810Lukas Rytz2015-08-241-3/+5
|\ \ \
| * | | SI-6810 Disallow EOL in char literalSom Snytt2015-06-291-3/+5
* | | | Merge remote-tracking branch 'origin/2.11.x' into 2.12.xSeth Tisue2015-08-2020-63/+65
|\ \ \ \
| * \ \ \ Merge pull request #4693 from scala/revert-3791-ticket/8346Seth Tisue2015-08-203-24/+6
| |\ \ \ \
| | * | | | Revert "SI-8346 Rebuild invariant sets in #toSet, avoiding CCE"Adriaan Moors2015-08-183-24/+6
| * | | | | Merge pull request #4697 from martijnhoekstra/patch-3Seth Tisue2015-08-191-2/+2
| |\ \ \ \ \
| | * | | | | Fix documentation of filter introduced in 13f30cmartijnhoekstra2015-08-191-2/+2
| | |/ / / /
| * / / / / Fix method name reference in Predef documentationJanek Bogucki2015-08-191-1/+1
| |/ / / /
| * | | | Merge pull request #4678 from stusmall/2.11.xLukas Rytz2015-08-101-0/+4
| |\ \ \ \
| | * | | | SI-3623 Improved error message for "filename too long" build errorsstusmall2015-08-071-0/+4
| * | | | | Merge pull request #4688 from retronym/topic/typer-debug-implicitsLukas Rytz2015-08-102-3/+5
| |\ \ \ \ \
| | * | | | | Fix tracing of implicit search under -Ytyper-debugJason Zaugg2015-08-062-3/+5
| * | | | | | Merge pull request #4620 from lastland/patch-1Seth Tisue2015-08-071-1/+2
| |\ \ \ \ \ \
| | * | | | | | Wait until the cat process is finished.Li Yao2015-08-071-1/+2
| | * | | | | | Fix the bug in the example in scala.sys.processLi Yao2015-07-111-1/+1
| * | | | | | | Merge pull request #4443 from adriaanm/abstractpromise-avoid-unsafeSeth Tisue2015-08-061-30/+7
| |\ \ \ \ \ \ \
| | * | | | | | | SI-8362: AbstractPromise extends AtomicReferenceMariot Chauvin2015-07-291-30/+7
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge pull request #4554 from som-snytt/issue/1931Seth Tisue2015-08-062-11/+23
| |\ \ \ \ \ \ \
| | * | | | | | | SI-1931 Hide Predef.any2stringadd in REPLSom Snytt2015-07-062-11/+23
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #4672 from janekdb/2.11.x-scaladoc-compilerSeth Tisue2015-08-0610-21/+21
| |\ \ \ \ \ \ \
| | * | | | | | | ScalaDoc fixes for compilerJanek Bogucki2015-07-2910-21/+21
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #4675 from retronym/ticket/9425Seth Tisue2015-08-061-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | SI-9425 Leave Companion.apply if constructor is less accessibleJason Zaugg2015-07-311-1/+2
| * | | | | | | | Merge pull request #4684 from janekdb/2.11.x-unit-return-in-mapSeth Tisue2015-08-061-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Stop mapping to Unit when executing finally code.Janek Bogucki2015-08-051-1/+1
| | | |_|_|/ / / / | | |/| | | | | |
| * / | | | | | | Avoid unnecessary implicit view on StringJanek Bogucki2015-08-051-2/+2
| |/ / / / / / /
* | | | | | | | Unfinalize the class DefaultPromiseJason Zaugg2015-08-131-6/+8
* | | | | | | | Merge pull request #4608 from ruippeixotog/improve-mutable-treesetSeth Tisue2015-08-064-54/+182
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-6938 Use mutable red-black tree in TreeSetRui Gonçalves2015-07-284-54/+182
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #4648 from Ichoran/issue/8554-againSeth Tisue2015-08-063-12/+19
|\ \ \ \ \ \ \ \