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 | 53 | -47/+514 |
|\ | |||||
| * | 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 #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 | 1 | -0/+28 |
| |\ \ \ \ | |||||
| | * | | | | Addtional test cases for tail calls in catches. | Jason Zaugg | 2012-12-05 | 1 | -0/+28 |
| | |/ / / | |||||
| * | | | | 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 #1668 from scalamacros/topic/pre-typemacros | Adriaan Moors | 2012-12-07 | 2 | -5/+5 |
| |\ \ \ | |||||
| | * | | | introduces global.pendingSuperCall | Eugene Burmako | 2012-12-06 | 1 | -2/+2 |
| | * | | | refactors handling of parent types | Eugene Burmako | 2012-12-06 | 1 | -3/+3 |
| | | |/ | | |/| | |||||
| * / | | SI-6696 removes "helper" tree factory methods | Eugene Burmako | 2012-12-06 | 29 | -42/+42 |
| |/ / | |||||
| * | | 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 #1697 from retronym/ticket/6745-2 | Adriaan Moors | 2012-12-06 | 1 | -0/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Don't return unimportables from importedSymbol. | Jason Zaugg | 2012-12-03 | 1 | -0/+22 |
* | | | | | | Merge branch 'merge-2.10-wip' into merge-2.10 | Paul Phillips | 2012-12-05 | 21 | -4/+428 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #1681 from paulp/issue/6731 | Adriaan Moors | 2012-12-05 | 6 | -0/+264 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722. | Paul Phillips | 2012-11-29 | 4 | -0/+81 |
| | * | | | Fix for SI-6731, dropped trees in selectDynamic. | Paul Phillips | 2012-11-28 | 2 | -0/+183 |
| * | | | | Merge pull request #1678 from martende/ticket/5753 | Eugene Burmako | 2012-11-29 | 8 | -0/+32 |
| |\ \ \ \ | |||||
| | * | | | | SI-5753 macros cannot be loaded when inherited from a class or a trait | martende | 2012-11-27 | 8 | -0/+32 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge pull request #1676 from retronym/topic/sm-interpolator | Paul Phillips | 2012-11-28 | 1 | -0/+41 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Adds a margin stripping string interpolator. | Jason Zaugg | 2012-11-26 | 1 | -0/+41 |
| * | | | | Merge pull request #1674 from scalamacros/topic/showraw | Josh Suereth | 2012-11-27 | 2 | -4/+6 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | SI-6718 fixes a volatile test | Eugene Burmako | 2012-11-26 | 2 | -4/+6 |
| * | | | | Merge pull request #1665 from paulp/issue/6687 | Adriaan Moors | 2012-11-25 | 1 | -0/+10 |
| |\ \ \ \ | |||||
| | * | | | | Fix for SI-6687, wrong isVar logic. | Paul Phillips | 2012-11-24 | 1 | -0/+10 |
| * | | | | | Merge pull request #1663 from paulp/merge-2.10.wip-x | Adriaan Moors | 2012-11-25 | 15 | -27/+178 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #1643 from retronym/ticket/6677 | Adriaan Moors | 2012-11-25 | 2 | -0/+61 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-6677 Insert required cast in `new qual.foo.T` | Jason Zaugg | 2012-11-18 | 2 | -0/+61 |
| * | | | | | | | Fix for SI-6706, Symbol breakage under GC. | Paul Phillips | 2012-11-23 | 1 | -0/+14 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Disabled part of a test. | Paul Phillips | 2012-11-25 | 2 | -25/+24 |
* | | | | | | | Merge branch 'merge-2.10.wip-x' into merge-2.10.x-master | Paul Phillips | 2012-11-23 | 25 | -25/+411 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10.wip-x | Paul Phillips | 2012-11-23 | 15 | -27/+178 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Merge pull request #1607 from retronym/ticket/6640 | Josh Suereth | 2012-11-19 | 8 | -25/+131 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | SI-6440 Address regressions around MissingRequirementError | Jason Zaugg | 2012-11-13 | 8 | -25/+131 |