Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge pull request #2215 from paulp/issue/7228 | Paul Phillips | 2013-03-13 | 3 | -19/+76 | |
|\ | ||||||
| * | Simplified the widening logic. | Paul Phillips | 2013-03-10 | 2 | -19/+1 | |
| * | SI-7228, bug in weak subtyping. | Paul Phillips | 2013-03-10 | 1 | -0/+75 | |
* | | Merge 2.10.x into master | Adriaan Moors | 2013-03-12 | 3 | -0/+61 | |
|\ \ | |/ |/| | ||||||
| * | Merge pull request #2225 from retronym/ticket/7234 | Adriaan Moors | 2013-03-11 | 2 | -0/+35 | |
| |\ | ||||||
| | * | SI-7234 Make named args play nice with dep. method types | Jason Zaugg | 2013-03-09 | 2 | -0/+35 | |
| * | | SI-7226 Fix inference regression caused by TypeVar equality. | Jason Zaugg | 2013-03-09 | 1 | -0/+26 | |
| |/ | ||||||
* | | Merge 2.10.x into master. | Adriaan Moors | 2013-03-05 | 2 | -0/+14 | |
|\| | ||||||
| * | Merge pull request #2193 from adriaanm/patmat-refactor | Adriaan Moors | 2013-03-05 | 3 | -0/+25 | |
| |\ | ||||||
| | * | Merge 2.10.1 into 2.10.x | Adriaan Moors | 2013-03-03 | 1 | -0/+11 | |
| | |\ | ||||||
| | | * | Merge pull request #2168 from retronym/ticket/7183 | Adriaan Moors | 2013-03-01 | 2 | -0/+14 | |
| | | |\ | ||||||
| | | | * | SI-7183 Disable unreachability for withFilter matches. | Jason Zaugg | 2013-02-25 | 2 | -0/+14 | |
| | * | | | [port] SI-7183 Disable unreachability for withFilter matches. | Adriaan Moors | 2013-03-03 | 2 | -0/+14 | |
* | | | | | Merge 2.10.x into master. | Adriaan Moors | 2013-03-05 | 1 | -0/+26 | |
|\| | | | | ||||||
| * | | | | Merge pull request #2178 from scalamacros/ticket/7190 | Paul Phillips | 2013-03-05 | 1 | -0/+26 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | SI-7190 macros no longer give rise to bridges | Eugene Burmako | 2013-02-27 | 1 | -0/+26 | |
| | | | | | ||||||
| \ \ \ \ | ||||||
| \ \ \ \ | ||||||
| \ \ \ \ | ||||||
*---. \ \ \ \ | Merge 2.10.x into master. | Adriaan Moors | 2013-03-05 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| / / | | | |/ / | ||||||
| | | * | | Merge pull request #2167 from retronym/ticket/7126 | Adriaan Moors | 2013-03-01 | 1 | -0/+11 | |
| | | |\ \ | ||||||
| | | | * | | SI-7126 Account for the alias types that don't dealias. | Jason Zaugg | 2013-02-25 | 1 | -0/+11 | |
| | | | |/ | ||||||
* | | | | | Merge branch 2.10.1 into master | Adriaan Moors | 2013-02-27 | 1 | -0/+13 | |
|\| | | | | ||||||
| * | | | | Merge 2.10.1 into 2.10.x. | Adriaan Moors | 2013-02-27 | 1 | -0/+13 | |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | ||||||
| | * / | SI-7180 Fix regression in implicit scope of HK type alias. | Jason Zaugg | 2013-02-25 | 1 | -0/+13 | |
| | |/ | ||||||
| | * | Additional test case for Lukas' fix to annotated originals. | Jason Zaugg | 2013-02-21 | 2 | -0/+14 | |
* | | | Merge 2.10.x into master. | Adriaan Moors | 2013-02-20 | 5 | -0/+49 | |
|\| | | ||||||
| * | | Merge pull request #2118 from lrytz/annotatedRetyping | James Iry | 2013-02-19 | 2 | -0/+14 | |
| |\ \ | ||||||
| | * | | Additional test case for Lukas' fix to annotated originals. | Jason Zaugg | 2013-02-18 | 2 | -0/+14 | |
| * | | | SI-5744 evidence params are now SYNTHETIC | Uladzimir Abramchuk | 2013-02-16 | 2 | -0/+28 | |
| * | | | Merge pull request #2115 from retronym/ticket/7091 | Adriaan Moors | 2013-02-12 | 1 | -0/+7 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | SI-7091 Don't try to put a protected accessor in a package. | Jason Zaugg | 2013-02-11 | 1 | -0/+7 | |
| | |/ | ||||||
* | | | Merge remote-tracking branch 'scala/2.10.x' into patmat-refactor-master | Adriaan Moors | 2013-02-12 | 2 | -0/+31 | |
|\| | | ||||||
| * | | Merge pull request #2111 from retronym/2.10.x | James Iry | 2013-02-11 | 1 | -0/+11 | |
| |\ \ | ||||||
| | * | | SI-6514 Avoid spurious dead code warnings | Jason Zaugg | 2013-02-10 | 1 | -0/+11 | |
| | |/ | ||||||
| * / | SI-6225 Fix import of inherited package object implicits | Jason Zaugg | 2013-02-09 | 1 | -0/+20 | |
| |/ | ||||||
* | | Merge pull request #2057 from paulp/pr/revert-6355 | Paul Phillips | 2013-02-12 | 1 | -0/+16 | |
|\ \ | ||||||
| * | | SI-6355, weakend implementation restriction on applyDynamic. | Paul Phillips | 2013-02-12 | 1 | -0/+16 | |
* | | | Maintenance of Predef. | Paul Phillips | 2013-02-12 | 38 | -163/+163 | |
|/ / | ||||||
* | | Merge remote-tracking branch 'origin/2.10.x' into merge-210 | Paul Phillips | 2013-02-10 | 9 | -5/+81 | |
|\| | ||||||
| * | Merge pull request #2017 from retronym/ticket/6666 | James Iry | 2013-02-08 | 1 | -47/+0 | |
| |\ | ||||||
| * \ | Merge pull request #2088 from retronym/ticket/6146 | James Iry | 2013-02-07 | 2 | -0/+61 | |
| |\ \ | ||||||
| | * | | SI-6146 More accurate prefixes for sealed subtypes. | Jason Zaugg | 2013-02-07 | 2 | -0/+61 | |
| * | | | Merge pull request #2079 from JamesIry/2.10.x_SI-7070 | James Iry | 2013-02-07 | 5 | -5/+0 | |
| |\ \ \ | ||||||
| | * | | | SI-7070 Turn restriction on companions in pkg objs into warning | James Iry | 2013-02-06 | 5 | -5/+0 | |
| * | | | | Merge pull request #1995 from retronym/ticket/5082 | James Iry | 2013-02-07 | 1 | -0/+14 | |
| |\ \ \ \ | ||||||
| | * | | | | SI-5082 Cycle avoidance between case companions | Jason Zaugg | 2013-02-07 | 1 | -0/+14 | |
| | |/ / / | ||||||
| * | | | | SI-7100 Fixed infinite recursion in duplicators | Vlad Ureche | 2013-02-07 | 1 | -0/+6 | |
| | | | | | ||||||
| \ \ \ \ | ||||||
| \ \ \ \ | ||||||
| \ \ \ \ | ||||||
*---. \ \ \ \ | Merge commit 'b43ae58f31'; commit 'b579a42ee3'; commit '81fa831609' into merg... | Paul Phillips | 2013-02-10 | 1 | -47/+0 | |
|\ \ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| | | ||||||
| | | * | | | Move a test from pos to run to highlight bytecode deficiencies. | Jason Zaugg | 2013-01-28 | 1 | -47/+0 | |
* | | | | | | Merge commit '558c059227' into merge-210 | Paul Phillips | 2013-02-09 | 2 | -0/+12 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | Merge pull request #2059 from VladUreche/issue/7060 | James Iry | 2013-02-06 | 2 | -0/+12 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| | * | | | | SI-7060 More conservative dead code elim marking | Vlad Ureche | 2013-02-05 | 2 | -0/+12 | |
| | | |_|/ | | |/| | |