summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1716 from paulp/merge-2.10Adriaan Moors2012-12-0553-139/+675
|\
| * Merge branch 'merge-2.10-wip' into merge-2.10Paul Phillips2012-12-0553-139/+675
|/|
| * Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10-wipPaul Phillips2012-12-054-6/+17
| |\
| | * Merge pull request #1704 from retronym/ticket/6754-2v2.10.0-RC5v2.10.0Adriaan Moors2012-12-053-2/+9
| | |\
| | | * Fix for rangepos crasher.Paul Phillips2012-12-043-2/+9
| | * | Merge pull request #1712 from jsuereth/fix/osgi-distv2.10.0-RC4Adriaan Moors2012-12-051-1/+6
| | |\ \ | | | |/ | | |/|
| | | * Fixing OSGi distribution.Josh Suereth2012-12-051-1/+6
| | |/
| | * Merge pull request #1686 from scalamacros/ticket/6685Eugene Burmako2012-12-021-3/+2
| | |\
| | | * SI-6685 fixes error handling in typedApplyEugene Burmako2012-11-301-3/+2
| | |/
| * | Merge pull request #1681 from paulp/issue/6731Adriaan Moors2012-12-0510-48/+331
| |\ \
| | * | Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722.Paul Phillips2012-11-297-1/+110
| | * | Fix for SI-6731, dropped trees in selectDynamic.Paul Phillips2012-11-283-47/+221
| * | | Merge pull request #1682 from paulp/assert-about-qualifierPaul Phillips2012-12-034-7/+20
| |\ \ \
| | * | | Asserts about Tree qualifiers.Paul Phillips2012-11-294-7/+20
| * | | | Merge pull request #1678 from martende/ticket/5753Eugene Burmako2012-11-2915-10/+57
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | neg test addedmartende2012-11-276-0/+22
| | * | | SI-5753 macros cannot be loaded when inherited from a class or a traitmartende2012-11-279-10/+35
| * | | | Merge pull request #1676 from retronym/topic/sm-interpolatorPaul Phillips2012-11-2813-55/+148
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Take advantage of the margin stripping interpolator.Jason Zaugg2012-11-269-55/+52
| | * | | Adds a margin stripping string interpolator.Jason Zaugg2012-11-264-0/+96
| * | | | Merge pull request #1674 from scalamacros/topic/showrawJosh Suereth2012-11-272-4/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | SI-6718 fixes a volatile testEugene Burmako2012-11-262-4/+6
| * | | | Merge pull request #1666 from paulp/issue/6707Adriaan Moors2012-11-252-4/+4
| |\ \ \ \
| | * | | | Mark pattern matcher synthetics as SYNTHETIC.Paul Phillips2012-11-242-2/+2
| | * | | | Set symbol flags at creation.Paul Phillips2012-11-241-2/+2
| * | | | | Merge pull request #1665 from paulp/issue/6687Adriaan Moors2012-11-252-1/+11
| |\ \ \ \ \
| | * | | | | Fix for SI-6687, wrong isVar logic.Paul Phillips2012-11-242-1/+11
| | |/ / / /
| * | | | | Merge pull request #1663 from paulp/merge-2.10.wip-xAdriaan Moors2012-11-2540-141/+410
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #1652 from jedesah/FlatHashTableAdriaan Moors2012-11-251-7/+6
| |\ \ \ \ \ \
| | * | | | | | findEntry implementation code more concise and DRYer.Jean-Remi Desjardins2012-11-201-7/+6
| * | | | | | | Merge pull request #1647 from adriaanm/backport-1626-2.10.xAdriaan Moors2012-11-253-1/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Fix for SI-6357, cycle with value classes.Paul Phillips2012-11-193-1/+12
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #1643 from retronym/ticket/6677Adriaan Moors2012-11-253-6/+77
| |\ \ \ \ \ \ \
| | * | | | | | | Refactoring of adaptMethodJason Zaugg2012-11-181-7/+16
| | * | | | | | | SI-6677 Insert required cast in `new qual.foo.T`Jason Zaugg2012-11-183-0/+62
| * | | | | | | | Merge pull request #1662 from paulp/issue/6706Eugene Burmako2012-11-242-0/+19
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Fix for SI-6706, Symbol breakage under GC.Paul Phillips2012-11-232-0/+19
| |/ / / / / / /
* | | | | | | | Merge pull request #1673 from paulp/serialversionuidPaul Phillips2012-12-036-42/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | Disabled part of a test.Paul Phillips2012-11-252-25/+24
| * | | | | | | | Account for existence of scala's ClassfileAnnotation.Paul Phillips2012-11-251-11/+15
| * | | | | | | | Eliminate some one-arg asserts.Paul Phillips2012-11-251-5/+5
| * | | | | | | | Fix for SerialVersionUID instability.Paul Phillips2012-11-253-1/+27
* | | | | | | | | Merge pull request #1669 from paulp/update-asmPaul Phillips2012-11-2874-7421/+7406
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Updated asm to 4.1.Paul Phillips2012-11-2474-7421/+7406
* | | | | | | | | Merge pull request #1664 from paulp/merge-2.10.x-masterAdriaan Moors2012-11-2558-180/+736
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'merge-2.10.wip-x' into merge-2.10.x-masterPaul Phillips2012-11-2358-180/+736
|/| | | | | | | | | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10.wip-xPaul Phillips2012-11-2340-141/+410
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge pull request #1656 from jsuereth/fix/remove-future-either-methodv2.10.0-RC3Adriaan Moors2012-11-211-23/+0
| | |\ \ \ \ \
| | | * | | | | Removing controversial `either` method from Futures API.Josh Suereth2012-11-211-23/+0
| | |/ / / / /
| | * | | | | Merge pull request #1607 from retronym/ticket/6640Josh Suereth2012-11-1915-53/+200
| | |\ \ \ \ \