Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #743 from axel22/issue/4541 | Adriaan Moors | 2012-06-19 | 6 | -5/+62 |
|\ | |||||
| * | Fix SI-4541. | Aleksandar Prokopec | 2012-06-18 | 6 | -5/+62 |
* | | Merge pull request #723 from paulp/topic/5910 | Adriaan Moors | 2012-06-19 | 2 | -1/+4 |
|\ \ | |||||
| * | | Fix for java parser edge case. | Paul Phillips | 2012-06-14 | 2 | -1/+4 |
* | | | Merge pull request #746 from adriaanm/pullreq/740-rebased | Adriaan Moors | 2012-06-19 | 16 | -497/+546 |
|\ \ \ | |||||
| * | | | Statistics reorganization | Martin Odersky | 2012-06-19 | 16 | -497/+546 |
* | | | | Merge pull request #744 from jsuereth/sbt-reflecton-fix | Adriaan Moors | 2012-06-19 | 9 | -286/+373 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into sbt-reflecton-fix | Josh Suereth | 2012-06-18 | 40 | -181/+806 |
| |\ \ \ \ | |||||
| * | | | | | Final clean up to get the build/testing working again. | Josh Suereth | 2012-06-18 | 4 | -37/+82 |
| * | | | | | More fixups. | Josh Suereth | 2012-06-14 | 3 | -17/+22 |
| * | | | | | Merge branch 'master' into sbt-reflecton-fix | Josh Suereth | 2012-06-13 | 5 | -4/+12 |
| |\ \ \ \ \ | |||||
| * | | | | | | Refactoring and temporary commit before finishing the fix. | Josh Suereth | 2012-06-13 | 8 | -253/+290 |
* | | | | | | | Merge pull request #737 from scalamacros/topic/reifyanonymous | Adriaan Moors | 2012-06-19 | 6 | -27/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | enables reification of anonymous classes | Eugene Burmako | 2012-06-18 | 6 | -27/+0 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #729 from scalamacros/topic/showraw | Adriaan Moors | 2012-06-19 | 31 | -161/+404 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | improves showRaw | Eugene Burmako | 2012-06-19 | 31 | -161/+404 |
* | | | | | | | Merge pull request #697 from retronym/ticket/4270-3 | Adriaan Moors | 2012-06-19 | 7 | -56/+125 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | SI-4270 Refactor for efficiency and clarity. | Jason Zaugg | 2012-06-14 | 1 | -6/+24 |
| * | | | | | | SI-4270 Disqualify in scope implicits that are shadowed. | Jason Zaugg | 2012-06-10 | 6 | -49/+100 |
| * | | | | | | SI-4270 Rename implicits to avoid name clashes. | Jason Zaugg | 2012-06-09 | 1 | -4/+4 |
* | | | | | | | Merge pull request #728 from scalamacros/topic/reflection-meeting | Josh Suereth | 2012-06-18 | 1 | -0/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | exposes extra tests for symbols as discussed on reflection meeting | Eugene Burmako | 2012-06-15 | 1 | -0/+17 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #739 from jsuereth/feature/collection-conversions | Josh Suereth | 2012-06-18 | 10 | -5/+219 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixing embarassing typo. | Josh Suereth | 2012-06-18 | 1 | -1/+1 |
| * | | | | | | | Migrate build to @odersky's suggestion of convertTo. | Josh Suereth | 2012-06-18 | 7 | -24/+29 |
| * | | | | | | | Rename copyTo to build based on consensus of 3 | Josh Suereth | 2012-06-18 | 5 | -14/+14 |
| * | | | | | | | Fixes from review. | Josh Suereth | 2012-06-18 | 5 | -16/+16 |
| * | | | | | | | Adding copyInto and toVector methods to collections. | Josh Suereth | 2012-06-18 | 8 | -0/+209 |
* | | | | | | | | Merge pull request #738 from scalamacros/topic/checkinit | Josh Suereth | 2012-06-18 | 2 | -9/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fixes checkinit, now it's for real | Eugene Burmako | 2012-06-18 | 2 | -9/+1 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #741 from axel22/issue/4954 | Josh Suereth | 2012-06-18 | 3 | -13/+81 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix SI-4954. | Aleksandar Prokopec | 2012-06-18 | 3 | -13/+81 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #742 from axel22/feature/pc-ctrie | Josh Suereth | 2012-06-18 | 2 | -5/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use `ThreadLocalRandom` in `TrieMap.size`. | Aleksandar Prokopec | 2012-06-18 | 2 | -5/+12 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #720 from phaller/cps-ticket-1681 | Josh Suereth | 2012-06-18 | 13 | -3/+208 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove unneeded use of Tree#id | phaller | 2012-06-15 | 2 | -16/+16 |
| * | | | | | | | | Replace context stack of AnnotationChecker with new mode for typing returns | phaller | 2012-06-15 | 7 | -32/+43 |
| * | | | | | | | | Remove stray comment | phaller | 2012-06-14 | 1 | -1/+0 |
| * | | | | | | | | CPS: enable return expressions in CPS code if they are in tail position | phaller | 2012-06-14 | 11 | -2/+197 |
* | | | | | | | | | Merge pull request #725 from paulp/issue/arrayops | Josh Suereth | 2012-06-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Remove unused type parameter. | Paul Phillips | 2012-06-15 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #736 from damienobrist/feature/diagrams-dev-revert | Josh Suereth | 2012-06-18 | 48 | -2962/+252 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Revert "Scaladoc class diagrams part 1" | Vlad Ureche | 2012-06-18 | 35 | -1649/+224 |
| * | | | | | | | Revert "Scaladoc class diagrams part 2" | Vlad Ureche | 2012-06-18 | 14 | -1301/+22 |
| * | | | | | | | Revert "Documented SyncVar" | Vlad Ureche | 2012-06-18 | 1 | -13/+7 |
* | | | | | | | | Merge pull request #718 from damienobrist/feature/diagrams-dev-final | Josh Suereth | 2012-06-17 | 48 | -252/+2962 |
|\| | | | | | | | |||||
| * | | | | | | | Documented SyncVar | Vlad Ureche | 2012-06-14 | 1 | -7/+13 |
| * | | | | | | | Scaladoc class diagrams part 2 | Damien | 2012-06-14 | 14 | -22/+1301 |
| * | | | | | | | Scaladoc class diagrams part 1 | Vlad Ureche | 2012-06-14 | 35 | -224/+1649 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #727 from scalamacros/topic/classtag-to-classmanifest | Josh Suereth | 2012-06-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ |