summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* SI-5779: Wrong warning message (comparing values of types Float/Double and Nu...Som Snytt2012-05-213-4/+22
* Merge pull request #593 from som-snytt/ticket/5760-pkgobj-warnAdriaan Moors2012-05-214-1/+31
|\
| * SI-5760: Improve error message for package$Klass conflict with KlassSom Snytt2012-05-204-1/+31
* | Merge pull request #591 from retronym/ticket/3888Adriaan Moors2012-05-211-0/+16
|\ \
| * | Test case closes SI-3880.Jason Zaugg2012-05-201-0/+16
| |/
* | Merge pull request #590 from retronym/ticket/3899Adriaan Moors2012-05-213-0/+39
|\ \
| * | Pending test for SI-3899.Jason Zaugg2012-05-203-0/+39
| |/
* | Merge pull request #587 from retronym/ticket/5125Adriaan Moors2012-05-215-10/+90
|\ \
| * | Improve test for SI-5125.Jason Zaugg2012-05-201-1/+1
| * | Fix @varargs forwarder generation in the presence of nested templates.Jason Zaugg2012-05-205-10/+90
| |/
* | Merge pull request #576 from axel22/issue/4717Adriaan Moors2012-05-212-13/+50
|\ \ | |/ |/|
| * Fixes previous commit.Aleksandar Prokopec2012-05-181-2/+2
| * Further fixes SI-4717.Aleksandar Prokopec2012-05-181-2/+2
| * Fixes SI-4717.Aleksandar Prokopec2012-05-184-38/+22
| * Add more logging.Aleksandar Prokopec2012-05-154-8/+61
* | Merge pull request #582 from heathermiller/scaladoc/keyboard-shortcutsAdriaan Moors2012-05-195-166/+276
|\ \
| * | Actually fixes SI-5055. Scaladoc now a zillion times less annoyingHeather Miller2012-05-191-16/+36
| * | Adds ability to navigate Scaladoc with arrow keysHeather Miller2012-05-192-149/+229
| * | Minor fix to Tab-switch keyboard shortcutHeather Miller2012-05-181-2/+2
| * | Added Scaladoc keyboard shortcut: tab toggles between panelsHeather Miller2012-05-184-5/+15
* | | Merge pull request #581 from lrytz/t4812-uncAdriaan Moors2012-05-192-3/+12
|\ \ \
| * | | Fix 4812Lukas Rytz2012-05-192-3/+12
* | | | Merge pull request #578 from lrytz/wip/t5044-squashedAdriaan Moors2012-05-195-3/+38
|\ \ \ \
| * | | | better feedback for SI-5044Lukas Rytz2012-05-185-3/+38
* | | | | Merge pull request #577 from lrytz/wip/t2488Adriaan Moors2012-05-195-1/+60
|\ \ \ \ \
| * | | | | Fix SI-2488Lukas Rytz2012-05-185-1/+60
| | |_|/ / | |/| | |
* | | | | Merge pull request #568 from hubertp/issue/5801Adriaan Moors2012-05-193-1/+41
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixes SI-5801, error messages regression. Review by @adriaanmHubert Plociniczak2012-05-183-1/+41
* | | | | Merge pull request #574 from axel22/issue/4461Josh Suereth2012-05-183-1/+23
|\ \ \ \ \
| * | | | | Fixes SI-4461.Aleksandar Prokopec2012-05-183-1/+23
* | | | | | Merge pull request #572 from lrytz/wip/t5544Adriaan Moors2012-05-187-1/+30
|\ \ \ \ \ \
| * | | | | | Fix SI-5544Lukas Rytz2012-05-187-1/+30
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #569 from phaller/wip-sip14-fixes-newAdriaan Moors2012-05-1810-83/+201
|\ \ \ \ \ \
| * | | | | | SIP-14: clean ups and fixesphaller2012-05-1710-83/+201
* | | | | | | Merge pull request #571 from lrytz/wip/t4138Josh Suereth2012-05-183-3/+14
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix 4138Lukas Rytz2012-05-183-3/+14
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #567 from lrytz/wip/t3488Josh Suereth2012-05-182-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Test case for SI-3844 - fixed by #virtpatmat @adriaanmLukas Rytz2012-05-162-0/+8
| |/ / / /
* | | | | Merge pull request #566 from lrytz/wip/t4928Adriaan Moors2012-05-185-18/+36
|\ \ \ \ \
| * | | | | Fix SI-4928Lukas Rytz2012-05-165-18/+36
| | |_|/ / | |/| | |
* | | | | Merge pull request #564 from scalamacros/topic/assertinresetattrsJosh Suereth2012-05-176-22/+17
|\ \ \ \ \
| * | | | | fixes resetAttrsEugene Burmako2012-05-176-22/+17
* | | | | | Merge pull request #563 from milessabin/feature/enrich-gentraversablesJosh Suereth2012-05-175-0/+105
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added infrastructure to enable easy enrichment of GenTraversables.Miles Sabin2012-05-175-0/+105
* | | | | | Merge pull request #562 from retronym/ticket/5803Josh Suereth2012-05-173-1/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | A band-aid solution for SI-5803.Jason Zaugg2012-05-173-1/+10
| | |/ / / | |/| | |
* | | | | Merge pull request #560 from heathermiller/issue/5623Adriaan Moors2012-05-171-7/+43
|\ \ \ \ \
| * | | | | Missed a stashHeather Miller2012-05-171-1/+1
| * | | | | Merge branch 'master' of git://github.com/scala/scala into issue/5623Heather Miller2012-05-1622-41/+123
| |\| | | |
| * | | | | Fixes SI-5623 on SyncVar and deprecates set & unset.Heather Miller2012-05-161-7/+43
| | |/ / / | |/| | |