Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge branch 'merge-wip-into-2.10.x' into merge-2.10-into-master | Paul Phillips | 2012-12-11 | 86 | -77/+826 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | 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 #1752 from scalamacros/ticket/5841 | Adriaan Moors | 2012-12-11 | 14 | -0/+132 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | SI-5841 reification of renamed imports | Andriy Polishchuk | 2012-12-11 | 14 | -0/+132 | |
| | | |_|_|/ / / / | | |/| | | | | | | ||||||
| * | | | | | | | | 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 #1691 from retronym/ticket/6558 | Adriaan Moors | 2012-12-10 | 4 | -0/+59 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Split test case to workaround incomplete error report. | Jason Zaugg | 2012-12-03 | 4 | -3/+28 | |
| | * | | | | | | | | SI-6558 Expand test case for annotation typos | Jason Zaugg | 2012-12-02 | 2 | -5/+26 | |
| | * | | | | | | | | Fixes SI-6558: typecheck lazy annotation info using non-silent context. | Hubert Plociniczak | 2012-12-02 | 2 | -0/+13 | |
| * | | | | | | | | | Merge pull request #1733 from retronym/ticket/6614 | Adriaan Moors | 2012-12-10 | 2 | -0/+19 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | SI-6614 Test case for fixed ArrayStack misconduct. | Jason Zaugg | 2012-12-08 | 2 | -0/+19 | |
| | | |_|/ / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #1732 from retronym/ticket/6690 | Adriaan Moors | 2012-12-10 | 1 | -0/+62 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | SI-6690 Release reference to last dequeued element. | Jason Zaugg | 2012-12-08 | 1 | -0/+62 | |
| | | |_|/ / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #1729 from JamesIry/SI-5789-2_2.10.x | Adriaan Moors | 2012-12-10 | 2 | -0/+28 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | SI-5789 Use the ReplTest framework in the test | James Iry | 2012-12-07 | 2 | -21/+21 | |
| | * | | | | | | | | | SI-5789 Checks in the right version of the test | James Iry | 2012-12-07 | 1 | -3/+1 | |
| | * | | | | | | | | | SI-5789 Removes assertion about implclass flag in Mixin.scala | James Iry | 2012-12-07 | 2 | -0/+30 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #1713 from retronym/ticket/5894 | Adriaan Moors | 2012-12-10 | 1 | -0/+17 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | SI-5894 Don't emit static forwarders for macros. | Jason Zaugg | 2012-12-05 | 1 | -0/+17 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #1711 from retronym/ticket/1672 | Adriaan Moors | 2012-12-10 | 4 | -0/+106 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Addtional test cases for tail calls in catches. | Jason Zaugg | 2012-12-05 | 3 | -1/+43 | |
| | * | | | | | | | | | SI-1672 Catches are in tail position without finally. | Jason Zaugg | 2012-12-05 | 3 | -0/+64 | |
| | |/ / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #1705 from paulp/warn-case-collision | Adriaan Moors | 2012-12-10 | 3 | -0/+22 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Warn when generated classfiles differ only in case. | Paul Phillips | 2012-12-05 | 3 | -0/+22 | |
| | |/ / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #1700 from retronym/ticket/6535 | Adriaan Moors | 2012-12-10 | 2 | -0/+21 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | SI-6535 Step back from the precipice of a cycle | Jason Zaugg | 2012-12-04 | 2 | -0/+21 | |
| | |/ / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #1699 from retronym/ticket/6549 | Adriaan Moors | 2012-12-10 | 2 | -0/+54 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | SI-6549 Improve escaping in REPL codegen. | Jason Zaugg | 2012-12-03 | 2 | -0/+54 | |
| | |/ / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #1692 from retronym/ticket/6547-2 | Adriaan Moors | 2012-12-10 | 2 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | SI-6547: elide box unbox pair only when primitives match | Miguel Garcia | 2012-12-02 | 2 | -0/+7 | |
| | | |_|_|/ / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #1675 from retronym/ticket/6667-2 | Adriaan Moors | 2012-12-10 | 4 | -0/+61 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | SI-6667 Abort after any ambiguous in-scope implicit | Jason Zaugg | 2012-11-26 | 4 | -0/+61 | |
| * | | | | | | | | | | Merge pull request #1672 from jedesah/Random | Adriaan Moors | 2012-12-10 | 1 | -0/+15 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | SI-4664 [Make scala.util.Random Serializable] Add test case | Jean-Remi Desjardins | 2012-12-04 | 1 | -0/+15 | |
| | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #1670 from paulp/issue/6712 | Adriaan Moors | 2012-12-10 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | Fix for SI-6712, bug in object lifting. | Paul Phillips | 2012-11-25 | 1 | -0/+5 | |
| * | | | | | | | | | | Merge pull request #1668 from scalamacros/topic/pre-typemacros | Adriaan Moors | 2012-12-07 | 12 | -33/+18 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | introduces global.pendingSuperCall | Eugene Burmako | 2012-12-06 | 1 | -2/+2 | |
| | * | | | | | | | | | | refactors handling of parent types | Eugene Burmako | 2012-12-06 | 11 | -31/+16 | |
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | ||||||
| * / | | | | | | | | | SI-6696 removes "helper" tree factory methods | Eugene Burmako | 2012-12-06 | 30 | -44/+44 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #1690 from retronym/ticket/6631 | Adriaan Moors | 2012-12-06 | 1 | -0/+18 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | SI-6631 Handle invalid escapes in string interpolators | Jason Zaugg | 2012-12-02 | 1 | -0/+18 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #1702 from scalamacros/topic/idempotency | Eugene Burmako | 2012-12-05 | 12 | -0/+241 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | tests for idempotency issues in the typechecker | Eugene Burmako | 2012-12-04 | 12 | -0/+241 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1719 from andriyp/ticket/5841-clean | Paul Phillips | 2012-12-10 | 14 | -0/+132 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | SI-5841 reification of renamed imports | Andriy Polishchuk | 2012-12-06 | 14 | -0/+132 | |
* | | | | | | | | | | | Merge pull request #1731 from retronym/ticket/5858 | Paul Phillips | 2012-12-10 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | SI-5858 xml.Node construction ambiguity is gone. | Jason Zaugg | 2012-12-08 | 1 | -0/+3 | |
* | | | | | | | | | | | Merge commit 'refs/pull/1717/head' into merge-msil-genjvm-delete | Paul Phillips | 2012-12-06 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | |