summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ | |/|
* | | Merge pull request #561 from retronym/topic/intellij-test-moduleAdriaan Moors2012-05-173-20/+17
|\ \ \ | |_|/ |/| |
| * | An IntelliJ module for test files.Jason Zaugg2012-05-173-20/+17
|/ /
* | Merge pull request #558 from lrytz/wip/t5259Josh Suereth2012-05-162-6/+27
|\ \
| * | Fix SI-5259Lukas Rytz2012-05-152-6/+27
* | | Merge pull request #557 from lrytz/wip/t5610Josh Suereth2012-05-163-5/+47
|\ \ \
| * | | Fix for SI-5610Lukas Rytz2012-05-153-5/+47
| |/ /
* | | Merge pull request #555 from srp/masterJosh Suereth2012-05-161-0/+22
|\ \ \
| * | | mutable.MapLike: override $mapNote to reflect actual require mutable apiScott R. Parish2012-05-151-0/+22
* | | | Merge pull request #553 from heathermiller/doc/linksJosh Suereth2012-05-1616-30/+27
|\ \ \ \ | |_|_|/ |/| | |
| * | | Corrects links in API documentationHeather Miller2012-05-1611-18/+16
| * | | Missed a straggling doc comment.Heather Miller2012-05-151-1/+1
| * | | Small documentation fixes & small fix to Scaladoc @see formattingHeather Miller2012-05-155-11/+10
* | | | Putting back things sbt noticed were gone.Paul Phillips2012-05-153-0/+30
* | | | Removing more unneeded code.Paul Phillips2012-05-1544-1432/+128
| |/ / |/| |
* | | Test adjustments.Paul Phillips2012-05-152-1/+4
* | | Removing extraneous files.Paul Phillips2012-05-1593-6478/+56
* | | Merge pull request #554 from srp/masterJosh Suereth2012-05-151-2/+2
|\ \ \
| * | | Enumeration#maxId: fix documentation to reflect realityScott R. Parish2012-05-151-2/+2
|/ / /
* / / Fixed positions for `AnnotationInfo.original`.Iulian Dragos2012-05-151-1/+5
|/ /
* | Tweak to avoid value classes in modifier check.Paul Phillips2012-05-141-1/+1
* | New starr with adriaan's fix from 1b198fadd1 .Paul Phillips2012-05-143-3/+3
* | Debugging output tweaks.Paul Phillips2012-05-146-27/+36
|/
* No-op changes.Paul Phillips2012-05-143-6/+3
*-------. Merge commit 'refs/pull/547/head'; commit 'refs/pull/548/head'; commit 'refs/...Paul Phillips2012-05-1415-49/+122
|\ \ \ \ \
| | | | | * Better fix for SI-5676. Review by @paulpHubert Plociniczak2012-05-146-30/+35
| | | | * | Closes SI-5796.Hubert Plociniczak2012-05-142-2/+11
| | | | |/
| | | * | fix SI-5384Lukas Rytz2012-05-142-2/+29
| | * | | suspend type vars in SubTypePair's equalsAdriaan Moors2012-05-141-4/+21