Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 2.10.x into master. | Adriaan Moors | 2013-02-20 | 16 | -1344/+154 |
|\ | |||||
| * | Merge pull request #2118 from lrytz/annotatedRetyping | James Iry | 2013-02-19 | 4 | -0/+82 |
| |\ | |||||
| | * | Additional test case for Lukas' fix to annotated originals. | Jason Zaugg | 2013-02-18 | 2 | -0/+14 |
| | * | Fix typing idempotency bug with Annotated trees | Lukas Rytz | 2013-02-12 | 2 | -0/+68 |
| * | | Merge pull request #2130 from vigdorchik/relax_doc | James Iry | 2013-02-19 | 2 | -9/+7 |
| |\ \ | |||||
| | * | | SI-7134: don't require doc.Settings in base api of scaladoc. | Eugene Vigdorchik | 2013-02-15 | 2 | -9/+7 |
| * | | | Merge pull request #2137 from huitseeker/issue/value-protected-in-inherited-1... | James Iry | 2013-02-19 | 4 | -0/+26 |
| |\ \ \ | |||||
| | * | | | unit test ide-t1000567 exercises SI-5063, aka #1000567. | François Garillot | 2013-02-19 | 4 | -0/+26 |
| * | | | | Merge pull request #2135 from heathermiller/futures-cleanups | James Iry | 2013-02-19 | 3 | -1331/+0 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Removing disabled, unneeded futures tests | Heather Miller | 2013-02-17 | 3 | -1331/+0 |
| * | | | | SI-5744 evidence params are now SYNTHETIC | Uladzimir Abramchuk | 2013-02-16 | 2 | -0/+28 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #2115 from retronym/ticket/7091 | Adriaan Moors | 2013-02-12 | 1 | -0/+7 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | SI-7091 Don't try to put a protected accessor in a package. | Jason Zaugg | 2013-02-11 | 1 | -0/+7 |
* | | | | SI-6642 Refactor mutable.TreeSet to use RedBlackTree instead of AVL | James Iry | 2013-02-13 | 1 | -0/+145 |
* | | | | SI-6642 Adds iteratorFrom, keysIteratorFrom, and valuesIteratorFrom | James Iry | 2013-02-13 | 1 | -0/+69 |
* | | | | Merge remote-tracking branch 'scala/2.10.x' into patmat-refactor-master | Adriaan Moors | 2013-02-12 | 5 | -0/+63 |
|\| | | | |||||
| * | | | Merge pull request #2113 from scalamacros/topic/silence | Paul Phillips | 2013-02-11 | 1 | -0/+6 |
| |\ \ \ | |||||
| | * | | | silences t6323a | Eugene Burmako | 2013-02-11 | 1 | -0/+6 |
| * | | | | Merge pull request #2111 from retronym/2.10.x | James Iry | 2013-02-11 | 1 | -0/+11 |
| |\ \ \ \ | |||||
| | * | | | | SI-6514 Avoid spurious dead code warnings | Jason Zaugg | 2013-02-10 | 1 | -0/+11 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #2098 from retronym/ticket/6225 | James Iry | 2013-02-11 | 1 | -0/+20 |
| |\ \ \ \ | |||||
| | * | | | | SI-6225 Fix import of inherited package object implicits | Jason Zaugg | 2013-02-09 | 1 | -0/+20 |
| * | | | | | Merge pull request #2097 from ViniciusMiana/SI-6935 | James Iry | 2013-02-11 | 1 | -0/+14 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-6935 Added readResolve in BoxedUnit | Vinicius Miana | 2013-02-08 | 1 | -0/+14 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #2096 from ViniciusMiana/SI-6370 | James Iry | 2013-02-11 | 1 | -0/+12 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | SI-6370 changed ListMap apply0 method to produce correct error message when a... | Vinicius Miana | 2013-02-08 | 1 | -0/+12 |
* | | | | | | Merge pull request #2057 from paulp/pr/revert-6355 | Paul Phillips | 2013-02-12 | 3 | -2/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-6355, weakend implementation restriction on applyDynamic. | Paul Phillips | 2013-02-12 | 3 | -2/+27 |
* | | | | | | | Maintenance of Predef. | Paul Phillips | 2013-02-12 | 76 | -300/+322 |
|/ / / / / / | |||||
* | | | | | | Merge remote-tracking branch 'origin/2.10.x' into merge-210 | Paul Phillips | 2013-02-10 | 81 | -213/+723 |
|\| | | | | | |||||
| * | | | | | Merge pull request #2100 from paulp/pr/fix-super-varargs-saved | James Iry | 2013-02-09 | 3 | -0/+30 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Fix for paramaccessor alias regression. | Paul Phillips | 2013-02-08 | 3 | -0/+30 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #2094 from scalamacros/ticket/6591 | James Iry | 2013-02-08 | 37 | -79/+242 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | accommodates pull request feedback | Eugene Burmako | 2013-02-08 | 2 | -0/+30 |
| | * | | | term and type reftrees are now reified uniformly | Eugene Burmako | 2013-02-08 | 23 | -77/+83 |
| | * | | | SI-6591 Reify and path-dependent types | Dmitry Bushev | 2013-02-08 | 14 | -4/+131 |
| * | | | | Merge pull request #2095 from hubertp/ticket/5675 | James Iry | 2013-02-08 | 13 | -14/+24 |
| |\ \ \ \ | |||||
| | * | | | | SI-5675 Discard duplicate feature warnings at a position | Jason Zaugg | 2013-02-08 | 13 | -14/+24 |
| * | | | | | Merge pull request #2092 from lrytz/t7096 | James Iry | 2013-02-08 | 2 | -0/+38 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-7096 SubstSymMap copies trees before modifying their symbols | Lukas Rytz | 2013-02-08 | 2 | -0/+38 |
| * | | | | | | Merge pull request #2017 from retronym/ticket/6666 | James Iry | 2013-02-08 | 16 | -37/+202 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #2091 from JamesIry/2.10.x_SI-6478 | James Iry | 2013-02-08 | 2 | -0/+52 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | [backport] SI-6478 Fixing JavaTokenParser ident | James Roper | 2013-02-07 | 2 | -0/+52 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #2035 from scalamacros/ticket/6989 | Eugene Burmako | 2013-02-08 | 3 | -0/+299 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #2085 from scalamacros/ticket/5824 | Eugene Burmako | 2013-02-08 | 2 | -0/+9 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | SI-5824 Fix crashes in reify with _* | Evgeny Kotelnikov | 2013-02-07 | 2 | -0/+9 |
| * | | | | | | | | Merge pull request #2093 from adriaanm/ticket-6961 | James Iry | 2013-02-07 | 2 | -82/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | SI-6961 no structural sharing in list serialization | Aleksandar Prokopec | 2013-02-07 | 2 | -82/+0 |
| * | | | | | | | | | Merge pull request #2090 from adriaanm/rebase-pr-2011 | James Iry | 2013-02-07 | 5 | -25/+83 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | SI-6187 Make partial functions re-typable | Jason Zaugg | 2013-02-07 | 5 | -25/+83 |
| | | |_|_|/ / / / / | | |/| | | | | | | |