Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4732 from SethTisue/merge-2.11.x-sep-8 | Adriaan Moors | 2015-09-09 | 45 | -66/+193 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/2.11.x' into 2.12.x | Seth Tisue | 2015-09-08 | 45 | -66/+193 |
* | | Merge pull request #4731 from soc/SI-7155 | Seth Tisue | 2015-09-08 | 1 | -250/+0 |
|\ \ | |/ |/| | |||||
| * | SI-7155 Remove deprecated private s.c.m.AVLTree | Simon Ochsenreither | 2015-09-05 | 1 | -250/+0 |
* | | Merge pull request #4709 from adriaanm/namers-accessors | Jason Zaugg | 2015-09-08 | 5 | -80/+99 |
|\ \ | |||||
| * | | Review feedback from retronym | Adriaan Moors | 2015-09-02 | 1 | -2/+3 |
| * | | Simplify decision whether to derive accessors | Adriaan Moors | 2015-09-02 | 3 | -27/+19 |
| * | | Streamline MethodSynthesis & Namers | Adriaan Moors | 2015-09-02 | 4 | -58/+84 |
* | | | Merge pull request #4671 from lrytz/t9375-easy | Jason Zaugg | 2015-09-08 | 3 | -17/+9 |
|\ \ \ | |||||
| * | | | SI-9375 add synthetic readResolve only for static modules | Lukas Rytz | 2015-07-30 | 1 | -0/+1 |
| * | | | Cleanup in Refchecks | Lukas Rytz | 2015-07-24 | 3 | -17/+8 |
* | | | | Merge pull request #4673 from puffnfresh/issue/6806 | Jason Zaugg | 2015-09-08 | 7 | -47/+102 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | SI-6806 Add an @implicitAmbiguous annotation | Brian McKenna | 2015-08-11 | 7 | -47/+102 |
* | | | | Merge pull request #4718 from Ichoran/issue/9379 | Seth Tisue | 2015-09-02 | 2 | -0/+4 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | SI-9379 Added toString to .zipped to allow Stream etc to short-circuit | Rex Kerr | 2015-08-30 | 2 | -0/+4 |
* | | | | Merge pull request #4691 from nicolasstucki/2.12.x-ScalaRunntime-fix-for-Scal... | Adriaan Moors | 2015-08-31 | 1 | -4/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Remove unnecessary dependency on parallel collections in ScalaRunTime. | Nicolas Stucki | 2015-08-20 | 1 | -4/+2 |
| |/ / | |||||
* | | | SI-9381 remove last vestiges of sun.misc.Unsafe | Seth Tisue | 2015-08-27 | 1 | -38/+0 |
* | | | Uncurry does Literal RHS for ConstantType def, not Constructors | Adriaan Moors | 2015-08-24 | 2 | -16/+18 |
* | | | Clean up Constructors a bit. | Adriaan Moors | 2015-08-24 | 1 | -96/+90 |
* | | | Merge pull request #4590 from som-snytt/issue/6810 | Lukas Rytz | 2015-08-24 | 1 | -3/+5 |
|\ \ \ | |||||
| * | | | SI-6810 Disallow EOL in char literal | Som Snytt | 2015-06-29 | 1 | -3/+5 |
* | | | | Merge remote-tracking branch 'origin/2.11.x' into 2.12.x | Seth Tisue | 2015-08-20 | 20 | -63/+65 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #4693 from scala/revert-3791-ticket/8346 | Seth Tisue | 2015-08-20 | 3 | -24/+6 |
| |\ \ \ \ | |||||
| | * | | | | Revert "SI-8346 Rebuild invariant sets in #toSet, avoiding CCE" | Adriaan Moors | 2015-08-18 | 3 | -24/+6 |
| * | | | | | Merge pull request #4697 from martijnhoekstra/patch-3 | Seth Tisue | 2015-08-19 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix documentation of filter introduced in 13f30c | martijnhoekstra | 2015-08-19 | 1 | -2/+2 |
| | |/ / / / | |||||
| * / / / / | Fix method name reference in Predef documentation | Janek Bogucki | 2015-08-19 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #4678 from stusmall/2.11.x | Lukas Rytz | 2015-08-10 | 1 | -0/+4 |
| |\ \ \ \ | |||||
| | * | | | | SI-3623 Improved error message for "filename too long" build errors | stusmall | 2015-08-07 | 1 | -0/+4 |
| * | | | | | Merge pull request #4688 from retronym/topic/typer-debug-implicits | Lukas Rytz | 2015-08-10 | 2 | -3/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix tracing of implicit search under -Ytyper-debug | Jason Zaugg | 2015-08-06 | 2 | -3/+5 |
| * | | | | | | Merge pull request #4620 from lastland/patch-1 | Seth Tisue | 2015-08-07 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Wait until the cat process is finished. | Li Yao | 2015-08-07 | 1 | -1/+2 |
| | * | | | | | | Fix the bug in the example in scala.sys.process | Li Yao | 2015-07-11 | 1 | -1/+1 |
| * | | | | | | | Merge pull request #4443 from adriaanm/abstractpromise-avoid-unsafe | Seth Tisue | 2015-08-06 | 1 | -30/+7 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | SI-8362: AbstractPromise extends AtomicReference | Mariot Chauvin | 2015-07-29 | 1 | -30/+7 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #4554 from som-snytt/issue/1931 | Seth Tisue | 2015-08-06 | 2 | -11/+23 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | SI-1931 Hide Predef.any2stringadd in REPL | Som Snytt | 2015-07-06 | 2 | -11/+23 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #4672 from janekdb/2.11.x-scaladoc-compiler | Seth Tisue | 2015-08-06 | 10 | -21/+21 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | ScalaDoc fixes for compiler | Janek Bogucki | 2015-07-29 | 10 | -21/+21 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #4675 from retronym/ticket/9425 | Seth Tisue | 2015-08-06 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | SI-9425 Leave Companion.apply if constructor is less accessible | Jason Zaugg | 2015-07-31 | 1 | -1/+2 |
| * | | | | | | | | Merge pull request #4684 from janekdb/2.11.x-unit-return-in-map | Seth Tisue | 2015-08-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Stop mapping to Unit when executing finally code. | Janek Bogucki | 2015-08-05 | 1 | -1/+1 |
| | | |_|_|/ / / / | | |/| | | | | | | |||||
| * / | | | | | | | Avoid unnecessary implicit view on String | Janek Bogucki | 2015-08-05 | 1 | -2/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Unfinalize the class DefaultPromise | Jason Zaugg | 2015-08-13 | 1 | -6/+8 |
* | | | | | | | | Merge pull request #4608 from ruippeixotog/improve-mutable-treeset | Seth Tisue | 2015-08-06 | 4 | -54/+182 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-6938 Use mutable red-black tree in TreeSet | Rui Gonçalves | 2015-07-28 | 4 | -54/+182 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #4648 from Ichoran/issue/8554-again | Seth Tisue | 2015-08-06 | 3 | -12/+19 |
|\ \ \ \ \ \ \ \ |