summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4671 from lrytz/t9375-easyJason Zaugg2015-09-089-24/+346
|\
| * SI-9375 add synthetic readResolve only for static modulesLukas Rytz2015-07-307-7/+338
| * Cleanup in RefchecksLukas Rytz2015-07-243-17/+8
* | Merge pull request #4673 from puffnfresh/issue/6806Jason Zaugg2015-09-0814-47/+146
|\ \
| * | SI-6806 Add an @implicitAmbiguous annotationBrian McKenna2015-08-1114-47/+146
* | | Merge pull request #4718 from Ichoran/issue/9379Seth Tisue2015-09-023-0/+20
|\ \ \
| * | | SI-9379 Added toString to .zipped to allow Stream etc to short-circuitRex Kerr2015-08-303-0/+20
* | | | Merge pull request #4691 from nicolasstucki/2.12.x-ScalaRunntime-fix-for-Scal...Adriaan Moors2015-08-312-4/+59
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unnecessary dependency on parallel collections in ScalaRunTime.Nicolas Stucki2015-08-202-4/+59
| |/ /
* | | Merge pull request #4712 from SethTisue/so-long-sun-misc-unsafeSeth Tisue2015-08-281-38/+0
|\ \ \
| * | | SI-9381 remove last vestiges of sun.misc.UnsafeSeth Tisue2015-08-271-38/+0
|/ / /
* | | Merge pull request #4708 from adriaanm/defaults-uncurry-constmethAdriaan Moors2015-08-242-100/+96
|\ \ \
| * | | 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-245-27/+89
|\ \ \
| * | | SI-6810 Spec reflects literal parsing literallySom Snytt2015-06-292-24/+30
| * | | SI-6810 Test for CRSom Snytt2015-06-292-3/+13
| * | | SI-6810 Disallow EOL in char literalSom Snytt2015-06-293-3/+49
* | | | Merge pull request #4700 from SethTisue/merge-2.11.x-aug-20Lukas Rytz2015-08-2446-176/+198
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/2.11.x' into 2.12.xSeth Tisue2015-08-2046-176/+198
|/| | | |
| * | | | Merge pull request #4693 from scala/revert-3791-ticket/8346Seth Tisue2015-08-205-64/+6
| |\ \ \ \
| | * | | | Revert "SI-8346 Rebuild invariant sets in #toSet, avoiding CCE"Adriaan Moors2015-08-185-64/+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
| | |/ / / /
| * | | | | Merge pull request #4695 from janekdb/2.11.x-scaladoc-PredefSeth Tisue2015-08-191-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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-063-30/+25
| |\ \ \ \ \ \ \
| | * | | | | | | SI-8362: AbstractPromise extends AtomicReferenceMariot Chauvin2015-07-293-30/+25
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge pull request #4554 from som-snytt/issue/1931Seth Tisue2015-08-0624-84/+139
| |\ \ \ \ \ \ \
| | * | | | | | | SI-1931 Hide Predef.any2stringadd in REPLSom Snytt2015-07-0624-84/+139
| | | |/ / / / / | | |/| | | | |
| * | | | | | | 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-062-1/+10
| |\ \ \ \ \ \ \
| | * | | | | | | SI-9425 Leave Companion.apply if constructor is less accessibleJason Zaugg2015-07-312-1/+10
| * | | | | | | | 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
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #4685 from janekdb/2.11.x-length-not-sizeSeth Tisue2015-08-061-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Avoid unnecessary implicit view on StringJanek Bogucki2015-08-051-2/+2
| | |/ / / / / / /
* | | | | | | | | Merge pull request #4690 from retronym/topic/defaultpromiseJason Zaugg2015-08-181-6/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Unfinalize the class DefaultPromiseJason Zaugg2015-08-131-6/+8
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4608 from ruippeixotog/improve-mutable-treesetSeth Tisue2015-08-068-59/+424
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-6938 Use mutable red-black tree in TreeSetRui Gonçalves2015-07-288-59/+424
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #4648 from Ichoran/issue/8554-againSeth Tisue2015-08-065-23/+35
|\ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 10:00:53 +0000