Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix for SI-5672 | Miguel Garcia | 2012-05-21 | 3 | -5/+25 |
* | Merge pull request #593 from som-snytt/ticket/5760-pkgobj-warn | Adriaan Moors | 2012-05-21 | 1 | -1/+5 |
|\ | |||||
| * | SI-5760: Improve error message for package$Klass conflict with Klass | Som Snytt | 2012-05-20 | 1 | -1/+5 |
* | | Merge pull request #587 from retronym/ticket/5125 | Adriaan Moors | 2012-05-21 | 1 | -10/+18 |
|\ \ | |||||
| * | | Fix @varargs forwarder generation in the presence of nested templates. | Jason Zaugg | 2012-05-20 | 1 | -10/+18 |
| |/ | |||||
* | | Merge pull request #576 from axel22/issue/4717 | Adriaan Moors | 2012-05-21 | 1 | -13/+15 |
|\ \ | |/ |/| | |||||
| * | Fixes previous commit. | Aleksandar Prokopec | 2012-05-18 | 1 | -2/+2 |
| * | Further fixes SI-4717. | Aleksandar Prokopec | 2012-05-18 | 1 | -2/+2 |
| * | Fixes SI-4717. | Aleksandar Prokopec | 2012-05-18 | 3 | -32/+20 |
| * | Add more logging. | Aleksandar Prokopec | 2012-05-15 | 3 | -8/+22 |
* | | Merge pull request #582 from heathermiller/scaladoc/keyboard-shortcuts | Adriaan Moors | 2012-05-19 | 5 | -166/+276 |
|\ \ | |||||
| * | | Actually fixes SI-5055. Scaladoc now a zillion times less annoying | Heather Miller | 2012-05-19 | 1 | -16/+36 |
| * | | Adds ability to navigate Scaladoc with arrow keys | Heather Miller | 2012-05-19 | 2 | -149/+229 |
| * | | Minor fix to Tab-switch keyboard shortcut | Heather Miller | 2012-05-18 | 1 | -2/+2 |
| * | | Added Scaladoc keyboard shortcut: tab toggles between panels | Heather Miller | 2012-05-18 | 4 | -5/+15 |
* | | | Merge pull request #581 from lrytz/t4812-unc | Adriaan Moors | 2012-05-19 | 1 | -3/+8 |
|\ \ \ | |||||
| * | | | Fix 4812 | Lukas Rytz | 2012-05-19 | 1 | -3/+8 |
* | | | | Merge pull request #578 from lrytz/wip/t5044-squashed | Adriaan Moors | 2012-05-19 | 2 | -2/+15 |
|\ \ \ \ | |||||
| * | | | | better feedback for SI-5044 | Lukas Rytz | 2012-05-18 | 2 | -2/+15 |
* | | | | | Merge pull request #577 from lrytz/wip/t2488 | Adriaan Moors | 2012-05-19 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix SI-2488 | Lukas Rytz | 2012-05-18 | 1 | -1/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #568 from hubertp/issue/5801 | Adriaan Moors | 2012-05-19 | 1 | -1/+3 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Fixes SI-5801, error messages regression. Review by @adriaanm | Hubert Plociniczak | 2012-05-18 | 1 | -1/+3 |
* | | | | | Merge pull request #574 from axel22/issue/4461 | Josh Suereth | 2012-05-18 | 1 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Fixes SI-4461. | Aleksandar Prokopec | 2012-05-18 | 1 | -0/+14 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #572 from lrytz/wip/t5544 | Adriaan Moors | 2012-05-18 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Fix SI-5544 | Lukas Rytz | 2012-05-18 | 1 | -1/+3 |
| |/ / / / | |||||
* | | | | | Merge pull request #569 from phaller/wip-sip14-fixes-new | Adriaan Moors | 2012-05-18 | 7 | -71/+113 |
|\ \ \ \ \ | |||||
| * | | | | | SIP-14: clean ups and fixes | phaller | 2012-05-17 | 7 | -71/+113 |
* | | | | | | Fix 4138 | Lukas Rytz | 2012-05-18 | 1 | -3/+6 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #566 from lrytz/wip/t4928 | Adriaan Moors | 2012-05-18 | 2 | -12/+21 |
|\ \ \ \ \ | |||||
| * | | | | | Fix SI-4928 | Lukas Rytz | 2012-05-16 | 2 | -12/+21 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #564 from scalamacros/topic/assertinresetattrs | Josh Suereth | 2012-05-17 | 6 | -22/+17 |
|\ \ \ \ \ | |||||
| * | | | | | fixes resetAttrs | Eugene Burmako | 2012-05-17 | 6 | -22/+17 |
* | | | | | | Merge pull request #563 from milessabin/feature/enrich-gentraversables | Josh Suereth | 2012-05-17 | 3 | -0/+71 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Added infrastructure to enable easy enrichment of GenTraversables. | Miles Sabin | 2012-05-17 | 3 | -0/+71 |
* | | | | | | Merge pull request #562 from retronym/ticket/5803 | Josh Suereth | 2012-05-17 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | A band-aid solution for SI-5803. | Jason Zaugg | 2012-05-17 | 1 | -1/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #560 from heathermiller/issue/5623 | Adriaan Moors | 2012-05-17 | 1 | -7/+43 |
|\ \ \ \ \ | |||||
| * | | | | | Missed a stash | Heather Miller | 2012-05-17 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' of git://github.com/scala/scala into issue/5623 | Heather Miller | 2012-05-16 | 19 | -41/+66 |
| |\| | | | | |||||
| * | | | | | Fixes SI-5623 on SyncVar and deprecates set & unset. | Heather Miller | 2012-05-16 | 1 | -7/+43 |
| | |/ / / | |/| | | | |||||
* | | | | | An IntelliJ module for test files. | Jason Zaugg | 2012-05-17 | 3 | -20/+17 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #558 from lrytz/wip/t5259 | Josh Suereth | 2012-05-16 | 1 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | Fix SI-5259 | Lukas Rytz | 2012-05-15 | 1 | -6/+6 |
* | | | | | Merge pull request #557 from lrytz/wip/t5610 | Josh Suereth | 2012-05-16 | 1 | -5/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Fix for SI-5610 | Lukas Rytz | 2012-05-15 | 1 | -5/+11 |
| |/ / / / | |||||
* | | | | | Merge pull request #555 from srp/master | Josh Suereth | 2012-05-16 | 1 | -0/+22 |
|\ \ \ \ \ | |||||
| * | | | | | mutable.MapLike: override $mapNote to reflect actual require mutable api | Scott R. Parish | 2012-05-15 | 1 | -0/+22 |
* | | | | | | Merge pull request #553 from heathermiller/doc/links | Josh Suereth | 2012-05-16 | 16 | -30/+27 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | |