summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #743 from axel22/issue/4541Adriaan Moors2012-06-196-5/+62
|\
| * Fix SI-4541.Aleksandar Prokopec2012-06-186-5/+62
* | Merge pull request #723 from paulp/topic/5910Adriaan Moors2012-06-192-1/+4
|\ \
| * | Fix for java parser edge case.Paul Phillips2012-06-142-1/+4
* | | Merge pull request #746 from adriaanm/pullreq/740-rebasedAdriaan Moors2012-06-1916-497/+546
|\ \ \
| * | | Statistics reorganizationMartin Odersky2012-06-1916-497/+546
* | | | Merge pull request #744 from jsuereth/sbt-reflecton-fixAdriaan Moors2012-06-199-286/+373
|\ \ \ \
| * \ \ \ Merge branch 'master' into sbt-reflecton-fixJosh Suereth2012-06-1840-181/+806
| |\ \ \ \
| * | | | | Final clean up to get the build/testing working again.Josh Suereth2012-06-184-37/+82
| * | | | | More fixups.Josh Suereth2012-06-143-17/+22
| * | | | | Merge branch 'master' into sbt-reflecton-fixJosh Suereth2012-06-135-4/+12
| |\ \ \ \ \
| * | | | | | Refactoring and temporary commit before finishing the fix.Josh Suereth2012-06-138-253/+290
* | | | | | | Merge pull request #737 from scalamacros/topic/reifyanonymousAdriaan Moors2012-06-196-27/+0
|\ \ \ \ \ \ \
| * | | | | | | enables reification of anonymous classesEugene Burmako2012-06-186-27/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #729 from scalamacros/topic/showrawAdriaan Moors2012-06-1931-161/+404
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | improves showRawEugene Burmako2012-06-1931-161/+404
* | | | | | | Merge pull request #697 from retronym/ticket/4270-3Adriaan Moors2012-06-197-56/+125
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | SI-4270 Refactor for efficiency and clarity.Jason Zaugg2012-06-141-6/+24
| * | | | | | SI-4270 Disqualify in scope implicits that are shadowed.Jason Zaugg2012-06-106-49/+100
| * | | | | | SI-4270 Rename implicits to avoid name clashes.Jason Zaugg2012-06-091-4/+4
* | | | | | | Merge pull request #728 from scalamacros/topic/reflection-meetingJosh Suereth2012-06-181-0/+17
|\ \ \ \ \ \ \
| * | | | | | | exposes extra tests for symbols as discussed on reflection meetingEugene Burmako2012-06-151-0/+17
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #739 from jsuereth/feature/collection-conversionsJosh Suereth2012-06-1810-5/+219
|\ \ \ \ \ \ \
| * | | | | | | Fixing embarassing typo.Josh Suereth2012-06-181-1/+1
| * | | | | | | Migrate build to @odersky's suggestion of convertTo.Josh Suereth2012-06-187-24/+29
| * | | | | | | Rename copyTo to build based on consensus of 3Josh Suereth2012-06-185-14/+14
| * | | | | | | Fixes from review.Josh Suereth2012-06-185-16/+16
| * | | | | | | Adding copyInto and toVector methods to collections.Josh Suereth2012-06-188-0/+209
* | | | | | | | Merge pull request #738 from scalamacros/topic/checkinitJosh Suereth2012-06-182-9/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fixes checkinit, now it's for realEugene Burmako2012-06-182-9/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #741 from axel22/issue/4954Josh Suereth2012-06-183-13/+81
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix SI-4954.Aleksandar Prokopec2012-06-183-13/+81
| |/ / / / / / /
* | | | | | | | Merge pull request #742 from axel22/feature/pc-ctrieJosh Suereth2012-06-182-5/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Use `ThreadLocalRandom` in `TrieMap.size`.Aleksandar Prokopec2012-06-182-5/+12
| |/ / / / / / /
* | | | | | | | Merge pull request #720 from phaller/cps-ticket-1681Josh Suereth2012-06-1813-3/+208
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unneeded use of Tree#idphaller2012-06-152-16/+16
| * | | | | | | | Replace context stack of AnnotationChecker with new mode for typing returnsphaller2012-06-157-32/+43
| * | | | | | | | Remove stray commentphaller2012-06-141-1/+0
| * | | | | | | | CPS: enable return expressions in CPS code if they are in tail positionphaller2012-06-1411-2/+197
* | | | | | | | | Merge pull request #725 from paulp/issue/arrayopsJosh Suereth2012-06-181-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Remove unused type parameter.Paul Phillips2012-06-151-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #736 from damienobrist/feature/diagrams-dev-revertJosh Suereth2012-06-1848-2962/+252
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Revert "Scaladoc class diagrams part 1"Vlad Ureche2012-06-1835-1649/+224
| * | | | | | | Revert "Scaladoc class diagrams part 2"Vlad Ureche2012-06-1814-1301/+22
| * | | | | | | Revert "Documented SyncVar"Vlad Ureche2012-06-181-13/+7
* | | | | | | | Merge pull request #718 from damienobrist/feature/diagrams-dev-finalJosh Suereth2012-06-1748-252/+2962
|\| | | | | | |
| * | | | | | | Documented SyncVarVlad Ureche2012-06-141-7/+13
| * | | | | | | Scaladoc class diagrams part 2Damien2012-06-1414-22/+1301
| * | | | | | | Scaladoc class diagrams part 1Vlad Ureche2012-06-1435-224/+1649
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #727 from scalamacros/topic/classtag-to-classmanifestJosh Suereth2012-06-151-1/+1
|\ \ \ \ \ \ \