Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-master | Jason Zaugg | 2013-09-10 | 10 | -130/+242 |
|\ | |||||
| * | Merge pull request #2916 from retronym/ticket/7818 | Jason Zaugg | 2013-09-10 | 1 | -0/+10 |
| |\ | |||||
| | * | SI-7818 Cast our way out of extended existential angst | Jason Zaugg | 2013-09-06 | 1 | -0/+10 |
| * | | Merge pull request #2922 from huitseeker/issue/7767 | Jason Zaugg | 2013-09-10 | 2 | -0/+19 |
| |\ \ | |||||
| | * \ | Merge pull request #1 from retronym/ticket/7767-test | François Garillot | 2013-09-09 | 2 | -0/+19 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | SI-7767 Test case for Scaladoc on early initializers | Jason Zaugg | 2013-09-09 | 2 | -0/+21 |
| | |/ | |||||
| * | | Merge pull request #2866 from retronym/ticket/7269 | Jason Zaugg | 2013-09-09 | 1 | -0/+32 |
| |\ \ | |||||
| | * | | SI-7269 Rework MapLike#retains to account for desugaring change | Jason Zaugg | 2013-08-29 | 1 | -0/+32 |
| * | | | SI-7814 Updates the instrumented version of ScalaRuntime. | Jason Zaugg | 2013-09-05 | 4 | -132/+42 |
| * | | | SI-7814 Avoid init cycle between Predef, `package`, ScalaRuntime | Jason Zaugg | 2013-09-05 | 2 | -0/+141 |
| | |/ | |/| | |||||
* | | | Merge pull request #2904 from som-snytt/issue/reflect-priv-ctor | Jason Zaugg | 2013-09-10 | 2 | -0/+23 |
|\ \ \ | |||||
| * | | | SI-7810 Reflect private constructor | Som Snytt | 2013-09-03 | 2 | -0/+23 |
* | | | | Merge pull request #2926 from paulp/pr/treecheckers | Jason Zaugg | 2013-09-10 | 7 | -0/+38 |
|\ \ \ \ | |||||
| * | | | | Noise reduction + minor enhance in TreeCheckers. | Paul Phillips | 2013-09-09 | 7 | -0/+38 |
* | | | | | Merge pull request #2915 from retronym/ticket/7817 | Jason Zaugg | 2013-09-10 | 4 | -0/+201 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | SI-7817 Fix regression in structural types | Jason Zaugg | 2013-09-09 | 2 | -4/+4 |
| * | | | | SI-7817 Tests to show the foibles of mkAttributedRef | Jason Zaugg | 2013-09-09 | 4 | -0/+201 |
* | | | | | Merge pull request #2907 from paulp/pr/typetree-original-rangepos | Jason Zaugg | 2013-09-09 | 4 | -11/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Eliminate TypeTrees with null original. | Paul Phillips | 2013-09-04 | 4 | -11/+28 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #2885 from som-snytt/issue/7791-script-linenums | Jason Zaugg | 2013-09-08 | 3 | -0/+25 |
|\ \ \ \ \ | |||||
| * | | | | | SI-7791 Line number table reflects underlying file | Som Snytt | 2013-09-05 | 3 | -0/+25 |
* | | | | | | Merge pull request #2865 from folone/trampolines | Grzegorz Kossakowski | 2013-09-07 | 1 | -0/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Alter TailRec to have map and flatMap | George Leontiev | 2013-08-24 | 1 | -0/+13 |
* | | | | | | | Merge pull request #2917 from som-snytt/issue/7805-repl-i | Grzegorz Kossakowski | 2013-09-07 | 4 | -5/+60 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-7805 REPL -i startup | Som Snytt | 2013-09-06 | 4 | -5/+60 |
* | | | | | | | | Merge pull request #2912 from retronym/ticket/7643 | Grzegorz Kossakowski | 2013-09-07 | 4 | -0/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-7643 Enable newPatternMatching in interactive. | Jason Zaugg | 2013-09-06 | 4 | -0/+18 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #2855 from adriaanm/modularize-xml-parsersv2.11.0-M5 | Grzegorz Kossakowski | 2013-09-06 | 131 | -3221/+19 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Prepare removal of scala-xml, scala-parser-combinators | Adriaan Moors | 2013-08-27 | 131 | -3221/+19 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.x | Grzegorz Kossakowski | 2013-09-05 | 9 | -0/+363 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge pull request #2888 from xeno-by/topic/typed-annotated | Jason Zaugg | 2013-09-04 | 3 | -0/+21 |
| |\ \ \ \ \ | |||||
| | * | | | | | typedAnnotated no longer emits nulls | Eugene Burmako | 2013-08-29 | 3 | -0/+21 |
| * | | | | | | Merge pull request #2901 from gkossakowski/backport-uniques-memory-fix | Grzegorz Kossakowski | 2013-09-04 | 1 | -0/+174 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-7150 Replace scala.reflect.internal.WeakHashSet | Grzegorz Kossakowski | 2013-09-03 | 1 | -0/+174 |
| * | | | | | | | Merge pull request #2876 from retronym/ticket/7782 | Jason Zaugg | 2013-09-04 | 2 | -0/+50 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | SI-7782 Derive type skolems at the ground level | Jason Zaugg | 2013-08-27 | 2 | -0/+50 |
| * | | | | | | | | Merge pull request #2899 from som-snytt/issue/4760-parser | Jason Zaugg | 2013-09-04 | 1 | -0/+34 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | SI-4760 Parser handles block-ending import | Som Snytt | 2013-08-30 | 1 | -0/+34 |
| * | | | | | | | | Commit .gitignore directly | Jason Zaugg | 2013-08-30 | 1 | -0/+0 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #2868 from retronym/ticket/7775 | Jason Zaugg | 2013-08-29 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | SI-7775 Harden against the shifting sands of System.getProperties | Jason Zaugg | 2013-08-26 | 1 | -0/+17 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #2871 from retronym/ticket/7779 | Jason Zaugg | 2013-08-29 | 1 | -0/+67 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | SI-7779 Account for class name compactification in reflection | Jason Zaugg | 2013-08-23 | 1 | -0/+67 |
| | |/ / / / / | |||||
* | | | | | | | SI-7781 Improve test and add comment | Som Snytt | 2013-09-02 | 1 | -5/+8 |
* | | | | | | | SI-7781 REPL stack trunc shows cause | Som Snytt | 2013-09-02 | 2 | -0/+167 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #2861 from densh/topic/deprecate-early-type-defs | Grzegorz Kossakowski | 2013-08-30 | 8 | -7/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | deprecate early type defs | Den Shabalin | 2013-08-28 | 8 | -7/+16 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #2886 from gkossakowski/merge-2.10.x | Jason Zaugg | 2013-08-30 | 38 | -3/+353 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'scala/2.10.x' | Grzegorz Kossakowski | 2013-08-29 | 38 | -3/+353 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Merge pull request #2860 from retronym/merge/2.10.2-to-2.10.x | James Iry | 2013-08-26 | 14 | -0/+85 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | |