Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch '2.10.x' into master | Paul Phillips | 2012-09-19 | 32 | -112/+240 | |
|\| | | | | | |_|_|_|/ |/| | | | | ||||||
| * | | | | Fixes SI-6354: improved error messages for Dynamic signature mismatches. | amin | 2012-09-19 | 3 | -2/+74 | |
| |/ / / | ||||||
| * | | | Merge pull request #1340 from gkossakowski/revert-static-annotation | Grzegorz Kossakowski | 2012-09-18 | 5 | -104/+0 | |
| |\ \ \ | | |_|/ | |/| | | ||||||
| | * | | Revert "Implement @static annotation on singleton object fields." | Grzegorz Kossakowski | 2012-09-17 | 2 | -43/+0 | |
| | * | | Revert "WIP add private/lazy checks and a few tests." | Grzegorz Kossakowski | 2012-09-17 | 2 | -24/+1 | |
| | * | | Revert "Fixes SI-6189." | Grzegorz Kossakowski | 2012-09-17 | 1 | -6/+0 | |
| | * | | Revert "Fix SI-4581." | Grzegorz Kossakowski | 2012-09-17 | 4 | -33/+1 | |
| | |/ | ||||||
| * / | SI-5692 better error message | Eugene Burmako | 2012-09-18 | 8 | -0/+28 | |
| |/ | ||||||
| * | SI-6336 Disallows value types in structuralal refinements | Martin Odersky | 2012-09-16 | 2 | -0/+15 | |
| * | Merge pull request #1302 from scalamacros/topic/reflection | Eugene Burmako | 2012-09-14 | 6 | -6/+6 | |
| |\ | ||||||
| | * | SI-6342 cleans up toolbox API | Eugene Burmako | 2012-09-15 | 6 | -6/+6 | |
| * | | Merge pull request #1290 from retronym/ticket/no-implicit-to-anyref | Paul Phillips | 2012-09-14 | 2 | -0/+57 | |
| |\ \ | ||||||
| | * | | A little cleanup along the Any to AnyRef trail. | Jason Zaugg | 2012-09-11 | 2 | -0/+57 | |
| * | | | Merge pull request #1299 from namin/si-6245 | Paul Phillips | 2012-09-14 | 6 | -0/+60 | |
| |\ \ \ | | |_|/ | |/| | | ||||||
| | * | | Fix for SI-6245 with workaround for SI-2296. | amin | 2012-09-13 | 6 | -0/+60 | |
* | | | | Merge remote-tracking branch 'origin/2.10.x' into merge-210 | Paul Phillips | 2012-09-15 | 48 | -69/+378 | |
|\| | | | ||||||
| * | | | Eliminate breaking relative names in source. | Paul Phillips | 2012-09-14 | 3 | -35/+35 | |
| * | | | Merge pull request #1295 from scalamacros/ticket/6323 | Eugene Burmako | 2012-09-14 | 17 | -28/+59 | |
| |\ \ \ | ||||||
| | * | | | SI-6310 AbsTypeTag => WeakTypeTag | Eugene Burmako | 2012-09-14 | 14 | -28/+28 | |
| | * | | | SI-6323 outlaws free types from TypeTag | Eugene Burmako | 2012-09-14 | 3 | -0/+31 | |
| * | | | | Merge pull request #1272 from paulp/issue/6340 | Josh Suereth | 2012-09-14 | 2 | -0/+31 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Fix for SI-6340, error message regression. | Paul Phillips | 2012-09-12 | 2 | -0/+31 | |
| | | |/ | | |/| | ||||||
| * | | | Merge pull request #1300 from retronym/ticket/6359 | Josh Suereth | 2012-09-13 | 2 | -0/+15 | |
| |\ \ \ | | |_|/ | |/| | | ||||||
| | * | | SI-6359 Deep prohibition of templates in value class | Jason Zaugg | 2012-09-14 | 2 | -0/+15 | |
| | |/ | ||||||
| * | | Better error message for pattern arity errors. | Paul Phillips | 2012-09-12 | 3 | -1/+11 | |
| * | | Merge remote-tracking branch 'origin/2.10.x' into fix-duration-issues-RK | Roland | 2012-09-12 | 19 | -5/+192 | |
| |\ \ | ||||||
| | * | | Avoid spurious warning for `def foo = x.foo`. | Jason Zaugg | 2012-09-11 | 2 | -6/+27 | |
| | |/ | ||||||
| | * | Merge pull request #1274 from retronym/ticket/6335 | Grzegorz Kossakowski | 2012-09-11 | 2 | -0/+16 | |
| | |\ | ||||||
| | | * | More tests for SI-6335. | Jason Zaugg | 2012-09-09 | 2 | -0/+16 | |
| | * | | Merge pull request #1284 from retronym/topic/deprecated-inheritance | Grzegorz Kossakowski | 2012-09-11 | 6 | -0/+55 | |
| | |\ \ | ||||||
| | | * | | Rescues @deprecated{Inheritance, Overriding} | Jason Zaugg | 2012-09-11 | 4 | -6/+39 | |
| | | * | | SI-6162 Adds @deprecatedInheritance/@deprecatedOverriding | Simon Ochsenreither | 2012-09-10 | 6 | -0/+22 | |
| | | |/ | ||||||
| | * | | Merge pull request #1275 from retronym/ticket/6276 | Grzegorz Kossakowski | 2012-09-11 | 5 | -2/+45 | |
| | |\ \ | ||||||
| | | * | | SI-6276 Warn on def or val that trivially loops infinitely | Jason Zaugg | 2012-09-09 | 5 | -2/+45 | |
| | | |/ | ||||||
| | * | | Merge pull request #1168 from retronym/ticket/6258-2 | Josh Suereth | 2012-09-06 | 2 | -0/+41 | |
| | |\ \ | ||||||
| | | * | | SI-6258 Reject partial funs with undefined param types | Jason Zaugg | 2012-08-23 | 2 | -0/+41 | |
| | * | | | More fix for invalid companions. | Paul Phillips | 2012-09-05 | 4 | -3/+14 | |
| | | |/ | | |/| | ||||||
| * / | | restrict Deadline to finite durations (would have to throw otherwise) | Roland | 2012-09-12 | 2 | -0/+23 | |
| |/ / | ||||||
* | | | Merge remote-tracking branch 'origin/2.10.x' into merge-210 | Paul Phillips | 2012-09-04 | 13 | -4/+159 | |
|\| | | ||||||
| * | | Merge pull request #1231 from paulp/issue/6273 | Josh Suereth | 2012-09-02 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | Fix for SI-6273, repl string interpolation. | Paul Phillips | 2012-09-01 | 1 | -1/+1 | |
| * | | | Better errors for Any/AnyRef issues. | Paul Phillips | 2012-09-01 | 6 | -6/+104 | |
| * | | | Fix for SI-6263, futile adaptation. | Paul Phillips | 2012-09-01 | 2 | -0/+12 | |
| * | | | Suppressed 'possible cause' mis-warning. | Paul Phillips | 2012-09-01 | 2 | -0/+13 | |
| |/ / | ||||||
| * | | Merge pull request #1201 from axel22/issue/4581 | Josh Suereth | 2012-09-01 | 4 | -1/+33 | |
| |\ \ | ||||||
| | * | | Fix SI-4581. | Aleksandar Prokopec | 2012-08-27 | 4 | -1/+33 | |
* | | | | Merge remote-tracking branch 'origin/2.10.x' into merge-210 | Paul Phillips | 2012-09-01 | 14 | -6/+69 | |
|\| | | | ||||||
| * | | | More useful -Xlog-implicits output. | Jason Zaugg | 2012-09-01 | 3 | -0/+25 | |
| * | | | Merge pull request #1213 from paulp/topic/anyval | Josh Suereth | 2012-08-30 | 2 | -6/+0 | |
| |\ \ \ | ||||||
| | * | | | Expanded the reach of value classes. | Paul Phillips | 2012-08-29 | 2 | -6/+0 |