Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '2.10.x' | amin | 2012-08-21 | 14 | -3/+70 |
|\ | |||||
| * | Merge pull request #1165 from jsuereth/fix/try-catch-libs | Josh Suereth | 2012-08-20 | 2 | -0/+18 |
| |\ | |||||
| | * | Adding test for try-catch library unification. | Josh Suereth | 2012-08-20 | 2 | -0/+18 |
| * | | Compilespeed improvements: Exists arguments and others | Martin Odersky | 2012-08-20 | 1 | -0/+26 |
| |/ | |||||
| * | Merge pull request #1159 from scalamacros/topic/cleanup | Josh Suereth | 2012-08-19 | 8 | -0/+18 |
| |\ | |||||
| | * | cleanup for macroExpand | Eugene Burmako | 2012-08-18 | 8 | -0/+18 |
| * | | Merge pull request #1162 from paulp/aug19-scala-graph | Paul Phillips | 2012-08-18 | 2 | -0/+6 |
| |\ \ | |||||
| | * | | Fix for community build blocker. | Paul Phillips | 2012-08-18 | 2 | -0/+6 |
| | |/ | |||||
| * / | SI-5788 correct test and symbol update | Vlad Ureche | 2012-08-19 | 1 | -3/+2 |
| |/ | |||||
* | | Merge pull request #1150 from paulp/issue/6150 | Paul Phillips | 2012-08-18 | 1 | -0/+36 |
|\ \ | |||||
| * | | Modified SI-6150 fix to use intended ReusableCBF. | Paul Phillips | 2012-08-16 | 1 | -23/+25 |
| * | | Fixes SI-6150. | Aleksandar Prokopec | 2012-08-15 | 1 | -0/+34 |
* | | | Merge remote-tracking branch 'origin/2.10.x' into merge-210 | Paul Phillips | 2012-08-17 | 34 | -21/+181 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #1151 from scalamacros/topic/cleanup | Eugene Burmako | 2012-08-17 | 18 | -20/+45 |
| |\ \ | |||||
| | * | | more cleanup for typedMacroBody | Eugene Burmako | 2012-08-17 | 14 | -11/+36 |
| | * | | shaves more than 150 lines off typedMacroBody | Eugene Burmako | 2012-08-17 | 4 | -9/+9 |
| * | | | Fixes SI-6236. | Aleksandar Prokopec | 2012-08-17 | 4 | -2/+32 |
| * | | | Fixes SI-6189. | Aleksandar Prokopec | 2012-08-17 | 3 | -0/+60 |
| * | | | Merge pull request #1093 from jsuereth/fix/SI-6208-2.10.x | Paul Phillips | 2012-08-16 | 1 | -0/+4 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Fix SI-6208. mutable.Queue now returns mutable.Queue for collection methods ... | Josh Suereth | 2012-08-08 | 1 | -0/+4 |
| * | | | Merge pull request #1141 from VladUreche/issue/asm | Vlad Ureche | 2012-08-16 | 3 | -0/+34 |
| |\ \ \ | |||||
| | * | | | Fixes backend crash due to incorrect consumedTypes | Vlad Ureche | 2012-08-15 | 3 | -0/+34 |
| * | | | | macroImplSigs => macroImplSig | Eugene Burmako | 2012-08-15 | 1 | -0/+1 |
| * | | | | cleanup of reflection- and macro-related stuff | Eugene Burmako | 2012-08-15 | 6 | -0/+6 |
| |/ / / | |||||
* | | | | Merge pull request #1126 from rklaehn/SI-6220 | Paul Phillips | 2012-08-16 | 1 | -0/+92 |
|\ \ \ \ | |||||
| * | | | | Added test that should cover all code paths of the changes done in SI-6220 | Ruediger Klaehn | 2012-08-16 | 1 | -0/+92 |
* | | | | | Merge pull request #1122 from paulp/topic/lubbing-not-flubbing | Paul Phillips | 2012-08-16 | 7 | -3/+101 |
|\ \ \ \ \ | |||||
| * | | | | | Improvement for SI-2251, failure to lub f-bounds. | Paul Phillips | 2012-08-11 | 7 | -3/+101 |
* | | | | | | Merge remote-tracking branch 'upstream/2.10.x' into merge-210 | Lukas Rytz | 2012-08-16 | 8 | -13/+71 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | Add Scaladoc flag to specify hidden implicit conversions | ingoem | 2012-08-14 | 1 | -1/+1 |
| * | | | | Merge pull request #1101 from scalamacros/ticket/5940 | Josh Suereth | 2012-08-14 | 5 | -0/+58 |
| |\ \ \ \ | |||||
| | * | | | | macro implementations must be public | Eugene Burmako | 2012-08-13 | 4 | -0/+17 |
| | * | | | | SI-5940 impls are no longer in macro def pickles | Eugene Burmako | 2012-08-13 | 1 | -0/+41 |
* | | | | | | Merge branch '2.10.x' | Adriaan Moors | 2012-08-14 | 70 | -294/+1328 |
|\| | | | | | |_|/ / / |/| | | | | |||||
| * | | | | Merge pull request #1130 from non/si6223-2.10.x | Josh Suereth | 2012-08-13 | 2 | -0/+15 |
| |\ \ \ \ | |||||
| | * | | | | Move side-effecting call out of debuglog(). Fixes SI-6223. | Erik Osheim | 2012-08-13 | 2 | -0/+15 |
| * | | | | | Merge pull request #1100 from adriaanm/ticket-6022b | Josh Suereth | 2012-08-13 | 1 | -0/+20 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | SI-6022 cleaner model of variable equality modulo <: | Adriaan Moors | 2012-08-09 | 1 | -0/+20 |
| | |/ / / | |||||
| * | | | | Merge pull request #1125 from hubertp/2.10.x-issue/6214 | Josh Suereth | 2012-08-13 | 2 | -0/+11 |
| |\ \ \ \ | |||||
| | * | | | | Fixes SI-6214. | Hubert Plociniczak | 2012-08-12 | 2 | -0/+11 |
| * | | | | | Merge pull request #1123 from paulp/topic/unpickle-resilience-2 | Josh Suereth | 2012-08-13 | 1 | -2/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | More resilience to missing classes. | Paul Phillips | 2012-08-11 | 1 | -2/+3 |
| * | | | | | | Merge pull request #1120 from paulp/ticket-6184-revised | Josh Suereth | 2012-08-11 | 1 | -0/+7 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | SI-6184 don't introduce dummies in checkableType | Adriaan Moors | 2012-08-09 | 1 | -0/+7 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge pull request #1118 from scalamacros/ticket/6201 | Josh Suereth | 2012-08-11 | 1 | -0/+13 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-6201 minor fixes in key points | Eugene Burmako | 2012-08-11 | 1 | -0/+13 |
| * | | | | | | Merge pull request #1105 from rklaehn/SI-6197 | Josh Suereth | 2012-08-11 | 2 | -0/+21 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Added test to check that removing all but one element from a HashTrieSet yiel... | Ruediger Klaehn | 2012-08-11 | 2 | -0/+21 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge pull request #1097 from rklaehn/SI-6198 | Josh Suereth | 2012-08-11 | 2 | -0/+24 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Added test for SI-6198 | Ruediger Klaehn | 2012-08-11 | 2 | -0/+24 |
| | |/ / / / |