Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '2.10.x' | Adriaan Moors | 2013-01-16 | 8 | -0/+88 |
|\ | |||||
| * | Merge pull request #1892 from retronym/ticket/6479 | Paul Phillips | 2013-01-15 | 1 | -0/+56 |
| |\ | |||||
| | * | SI-6479 Don't lift try exprs in label arguments. | Jason Zaugg | 2013-01-13 | 1 | -0/+56 |
| * | | Merge pull request #1878 from adriaanm/ticket-6925 | Adriaan Moors | 2013-01-14 | 2 | -0/+27 |
| |\ \ | |||||
| | * | | rework partial function synthesis | Adriaan Moors | 2013-01-09 | 1 | -0/+18 |
| | * | | SI-6925 use concrete type in applyOrElse's match's selector | Adriaan Moors | 2013-01-09 | 1 | -0/+9 |
| * | | | SI-5954 Implementation restriction preventing companions in package objs | James Iry | 2013-01-13 | 5 | -0/+5 |
| | |/ | |/| | |||||
| * | | Backport of SI-6846. | Jason Zaugg | 2013-01-08 | 1 | -0/+28 |
| |/ | |||||
* | | SI-6966 Fix regression in implicit resolution | Jason Zaugg | 2013-01-12 | 1 | -0/+17 |
* | | Merge commit 'refs/pull/1844/head' into merge/pr-1844 | Paul Phillips | 2013-01-11 | 8 | -0/+28 |
|\ \ | |||||
| * | | SI-5923 adapt macros when they are deferred | Eugene Burmako | 2013-01-09 | 8 | -0/+28 |
* | | | Merge pull request #1874 from paulp/pr/mode-value-class | Paul Phillips | 2013-01-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Made "mode" into a value class. | Paul Phillips | 2013-01-09 | 1 | -1/+1 |
| |/ / | |||||
* | | | SI-6566, unsoundness with alias variance. | Paul Phillips | 2013-01-09 | 1 | -0/+7 |
* | | | Boosted test coverage. | Paul Phillips | 2013-01-09 | 1 | -0/+7 |
|/ / | |||||
* | | Merge branch '2.10.x' | Adriaan Moors | 2013-01-08 | 3 | -0/+14 |
|\| | |||||
| * | Merge pull request #1834 from paulp/issue/6897 | Paul Phillips | 2013-01-06 | 1 | -0/+6 |
| |\ | |||||
| | * | SI-6897, lubs and varargs star. | Paul Phillips | 2012-12-31 | 1 | -0/+6 |
| * | | SI-6896, spurious warning with overloaded main. | Paul Phillips | 2012-12-31 | 2 | -0/+8 |
| |/ | |||||
* | | adds c.introduceTopLevel | Eugene Burmako | 2013-01-05 | 3 | -3/+3 |
* | | Updated copyright to 2013 | Carlo Dapor | 2013-01-02 | 2 | -2/+2 |
* | | Merge pull request #1809 from scalamacros/topic/ident-attachments | Paul Phillips | 2012-12-29 | 4 | -0/+23 |
|\ \ | |||||
| * | | fixes the typedIdent problem for good | Eugene Burmako | 2012-12-28 | 4 | -0/+23 |
* | | | SI-6846, regression in type constructor inference. | Paul Phillips | 2012-12-28 | 1 | -0/+28 |
* | | | Merge pull request #1786 from retronym/ticket/6745-3 | Paul Phillips | 2012-12-26 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | SI-6745 Fix <init> lookup | Jason Zaugg | 2012-12-18 | 1 | -0/+4 |
* | | | | Removed old pattern matcher. | Paul Phillips | 2012-12-26 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #1506 from som-snytt/issue/6446-plugin-desc | Paul Phillips | 2012-12-22 | 2 | -21/+0 |
|\ \ \ | |||||
| * | | | PluginComponent contributes description to -Xshow-phases. | Som Snytt | 2012-12-18 | 2 | -21/+0 |
| |/ / | |||||
* | | | Merge pull request #1769 from soc/SI-6809 | Adriaan Moors | 2012-12-20 | 5 | -9/+9 |
|\ \ \ | |||||
| * | | | SI-6809 Forbids deprecated case class definitions without parameter list | Simon Ochsenreither | 2012-12-13 | 5 | -9/+9 |
* | | | | Merge remote-tracking branch 'origin/2.10.x' into merge-2.10.x | Paul Phillips | 2012-12-20 | 12 | -0/+121 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | Merge pull request #1790 from paulp/2.10.0-wip-merge | Adriaan Moors | 2012-12-20 | 2 | -0/+6 |
| |\ \ | |||||
| | * \ | Merge remote-tracking branch 'origin/2.10.0-wip' into 2.10.0-wip-merge | Paul Phillips | 2012-12-19 | 2 | -0/+6 |
| | |\ \ | |||||
| * | \ \ | Merge pull request #1788 from retronym/ticket/6848 | Paul Phillips | 2012-12-20 | 2 | -0/+4 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Implicit vars should have non-implicit setters. | Jason Zaugg | 2012-12-19 | 2 | -0/+4 |
| * | | | | Merge pull request #1759 from scalamacros/topic/annotated | Paul Phillips | 2012-12-19 | 4 | -0/+59 |
| |\ \ \ \ | |||||
| | * | | | | fixes incorrect handling of Annotated in lazy copier | Eugene Burmako | 2012-12-13 | 4 | -0/+59 |
| * | | | | | Merge pull request #1707 from retronym/ticket/5390 | Adriaan Moors | 2012-12-17 | 1 | -0/+11 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Test showing the absence of a forward reference | Jason Zaugg | 2012-12-16 | 1 | -0/+11 |
| * | | | | | Merge pull request #1766 from scalamacros/topic/typed-ident-attachments | Eugene Burmako | 2012-12-14 | 4 | -0/+22 |
| |\ \ \ \ \ | |||||
| | * | | | | | typedIdent no longer destroys attachments | Eugene Burmako | 2012-12-13 | 4 | -0/+22 |
| * | | | | | | Recurse into instantiations when stripping type vars. | Hubert Plociniczak | 2012-12-12 | 1 | -0/+25 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #1749 from paulp/pr/6595 | Paul Phillips | 2012-12-12 | 2 | -0/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix for SI-6595, lost modifiers in early defs. | Paul Phillips | 2012-12-10 | 2 | -0/+19 |
* | | | | | | | Merge branch 'merge-wip-into-2.10.x' into merge-2.10-into-master | Paul Phillips | 2012-12-11 | 6 | -0/+49 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/2.10.0-wip' into merge-wip-into-2.10.x | Paul Phillips | 2012-12-11 | 2 | -0/+6 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #1701 from retronym/ticket/5877 | Adriaan Moors | 2012-12-10 | 2 | -0/+27 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-5877 Support implicit classes in package objects | Jason Zaugg | 2012-12-04 | 2 | -0/+27 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge pull request #1711 from retronym/ticket/1672 | Adriaan Moors | 2012-12-10 | 1 | -0/+10 |
| |\ \ \ \ \ |