Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1716 from paulp/merge-2.10 | Adriaan Moors | 2012-12-05 | 53 | -139/+675 |
|\ | |||||
| * | Merge branch 'merge-2.10-wip' into merge-2.10 | Paul Phillips | 2012-12-05 | 53 | -139/+675 |
|/| | |||||
| * | Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10-wip | Paul Phillips | 2012-12-05 | 4 | -6/+17 |
| |\ | |||||
| | * | Merge pull request #1704 from retronym/ticket/6754-2v2.10.0-RC5v2.10.0 | Adriaan Moors | 2012-12-05 | 3 | -2/+9 |
| | |\ | |||||
| | | * | Fix for rangepos crasher. | Paul Phillips | 2012-12-04 | 3 | -2/+9 |
| | * | | Merge pull request #1712 from jsuereth/fix/osgi-distv2.10.0-RC4 | Adriaan Moors | 2012-12-05 | 1 | -1/+6 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Fixing OSGi distribution. | Josh Suereth | 2012-12-05 | 1 | -1/+6 |
| | |/ | |||||
| | * | Merge pull request #1686 from scalamacros/ticket/6685 | Eugene Burmako | 2012-12-02 | 1 | -3/+2 |
| | |\ | |||||
| | | * | SI-6685 fixes error handling in typedApply | Eugene Burmako | 2012-11-30 | 1 | -3/+2 |
| | |/ | |||||
| * | | Merge pull request #1681 from paulp/issue/6731 | Adriaan Moors | 2012-12-05 | 10 | -48/+331 |
| |\ \ | |||||
| | * | | Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722. | Paul Phillips | 2012-11-29 | 7 | -1/+110 |
| | * | | Fix for SI-6731, dropped trees in selectDynamic. | Paul Phillips | 2012-11-28 | 3 | -47/+221 |
| * | | | Merge pull request #1682 from paulp/assert-about-qualifier | Paul Phillips | 2012-12-03 | 4 | -7/+20 |
| |\ \ \ | |||||
| | * | | | Asserts about Tree qualifiers. | Paul Phillips | 2012-11-29 | 4 | -7/+20 |
| * | | | | Merge pull request #1678 from martende/ticket/5753 | Eugene Burmako | 2012-11-29 | 15 | -10/+57 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | neg test added | martende | 2012-11-27 | 6 | -0/+22 |
| | * | | | SI-5753 macros cannot be loaded when inherited from a class or a trait | martende | 2012-11-27 | 9 | -10/+35 |
| * | | | | Merge pull request #1676 from retronym/topic/sm-interpolator | Paul Phillips | 2012-11-28 | 13 | -55/+148 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Take advantage of the margin stripping interpolator. | Jason Zaugg | 2012-11-26 | 9 | -55/+52 |
| | * | | | Adds a margin stripping string interpolator. | Jason Zaugg | 2012-11-26 | 4 | -0/+96 |
| * | | | | 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 #1666 from paulp/issue/6707 | Adriaan Moors | 2012-11-25 | 2 | -4/+4 |
| |\ \ \ \ | |||||
| | * | | | | Mark pattern matcher synthetics as SYNTHETIC. | Paul Phillips | 2012-11-24 | 2 | -2/+2 |
| | * | | | | Set symbol flags at creation. | Paul Phillips | 2012-11-24 | 1 | -2/+2 |
| * | | | | | Merge pull request #1665 from paulp/issue/6687 | Adriaan Moors | 2012-11-25 | 2 | -1/+11 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix for SI-6687, wrong isVar logic. | Paul Phillips | 2012-11-24 | 2 | -1/+11 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #1663 from paulp/merge-2.10.wip-x | Adriaan Moors | 2012-11-25 | 40 | -141/+410 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #1652 from jedesah/FlatHashTable | Adriaan Moors | 2012-11-25 | 1 | -7/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | findEntry implementation code more concise and DRYer. | Jean-Remi Desjardins | 2012-11-20 | 1 | -7/+6 |
| * | | | | | | | Merge pull request #1647 from adriaanm/backport-1626-2.10.x | Adriaan Moors | 2012-11-25 | 3 | -1/+12 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix for SI-6357, cycle with value classes. | Paul Phillips | 2012-11-19 | 3 | -1/+12 |
| | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #1643 from retronym/ticket/6677 | Adriaan Moors | 2012-11-25 | 3 | -6/+77 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Refactoring of adaptMethod | Jason Zaugg | 2012-11-18 | 1 | -7/+16 |
| | * | | | | | | | SI-6677 Insert required cast in `new qual.foo.T` | Jason Zaugg | 2012-11-18 | 3 | -0/+62 |
| * | | | | | | | | Merge pull request #1662 from paulp/issue/6706 | Eugene Burmako | 2012-11-24 | 2 | -0/+19 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | * | | | | | | | Fix for SI-6706, Symbol breakage under GC. | Paul Phillips | 2012-11-23 | 2 | -0/+19 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #1673 from paulp/serialversionuid | Paul Phillips | 2012-12-03 | 6 | -42/+71 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Disabled part of a test. | Paul Phillips | 2012-11-25 | 2 | -25/+24 |
| * | | | | | | | | Account for existence of scala's ClassfileAnnotation. | Paul Phillips | 2012-11-25 | 1 | -11/+15 |
| * | | | | | | | | Eliminate some one-arg asserts. | Paul Phillips | 2012-11-25 | 1 | -5/+5 |
| * | | | | | | | | Fix for SerialVersionUID instability. | Paul Phillips | 2012-11-25 | 3 | -1/+27 |
* | | | | | | | | | Merge pull request #1669 from paulp/update-asm | Paul Phillips | 2012-11-28 | 74 | -7421/+7406 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Updated asm to 4.1. | Paul Phillips | 2012-11-24 | 74 | -7421/+7406 |
* | | | | | | | | | Merge pull request #1664 from paulp/merge-2.10.x-master | Adriaan Moors | 2012-11-25 | 58 | -180/+736 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'merge-2.10.wip-x' into merge-2.10.x-master | Paul Phillips | 2012-11-23 | 58 | -180/+736 |
|/| | | | | | | | | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10.wip-x | Paul Phillips | 2012-11-23 | 40 | -141/+410 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Merge pull request #1656 from jsuereth/fix/remove-future-either-methodv2.10.0-RC3 | Adriaan Moors | 2012-11-21 | 1 | -23/+0 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Removing controversial `either` method from Futures API. | Josh Suereth | 2012-11-21 | 1 | -23/+0 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #1607 from retronym/ticket/6640 | Josh Suereth | 2012-11-19 | 15 | -53/+200 |
| | |\ \ \ \ \ |