summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge 2.10.x into master.Adriaan Moors2013-02-2031-1424/+224
|\
| * Merge pull request #2146 from adriaanm/build-2.10.2Grzegorz Kossakowski2013-02-201-1/+1
| |\
| | * bump build number to 2.10.2Adriaan Moors2013-02-201-1/+1
| |/
| * Merge pull request #2118 from lrytz/annotatedRetypingJames Iry2013-02-195-9/+87
| |\
| | * Merge pull request #1 from retronym/topic/annotatedRetyping-testLukas Rytz2013-02-182-0/+14
| | |\
| | | * Additional test case for Lukas' fix to annotated originals.Jason Zaugg2013-02-182-0/+14
| | |/
| | * Fix typing idempotency bug with Annotated treesLukas Rytz2013-02-123-9/+73
| * | Merge pull request #2129 from gkossakowski/issues/SI-7130-StatisticsJames Iry2013-02-191-1/+1
| |\ \
| | * | Fix SI-7130: Memory leaked caused by StatisticsGrzegorz Kossakowski2013-02-141-1/+1
| * | | Merge pull request #2136 from vigdorchik/scannersJames Iry2013-02-191-21/+13
| |\ \ \
| | * | | SI-7143 Fix scanner docComment: docBuffer and docPos are initializedEugene Vigdorchik2013-02-191-21/+13
| | |/ /
| * | | Merge pull request #2130 from vigdorchik/relax_docJames Iry2013-02-196-40/+41
| |\ \ \
| | * | | SI-7134: don't require doc.Settings in base api of scaladoc.Eugene Vigdorchik2013-02-156-40/+41
| | |/ /
| * | | Merge pull request #2137 from huitseeker/issue/value-protected-in-inherited-1...James Iry2013-02-194-0/+26
| |\ \ \
| | * | | unit test ide-t1000567 exercises SI-5063, aka #1000567.François Garillot2013-02-194-0/+26
| * | | | Merge pull request #2135 from heathermiller/futures-cleanupsJames Iry2013-02-193-1331/+0
| |\ \ \ \
| | * | | | Removing disabled, unneeded futures testsHeather Miller2013-02-173-1331/+0
| * | | | | Merge pull request #2131 from jozic/scaladoc-cleanupJames Iry2013-02-193-8/+8
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | make Future scaladoc examples up-to-date and compilableEugene Platonov2013-02-153-8/+8
| | | |/ / | | |/| |
| * | | | Merge pull request #2132 from u-abramchuk/SI5744Eugene Burmako2013-02-166-11/+32
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | SI-5744 evidence params are now SYNTHETICUladzimir Abramchuk2013-02-166-11/+32
| |/ / /
| * | | Merge pull request #2115 from retronym/ticket/7091Adriaan Moors2013-02-122-1/+12
| |\ \ \ | | |_|/ | |/| |
| | * | SI-7091 Don't try to put a protected accessor in a package.Jason Zaugg2013-02-112-0/+8
| | * | SI-7091 Add a diagnostic for the "no acc def buf" error.Jason Zaugg2013-02-101-1/+4
* | | | Merge pull request #2119 from JamesIry/master_SI-6642James Iry2013-02-2013-97/+411
|\ \ \ \
| * | | | SI-6642 Code cleanup from review of iteratorFromJames Iry2013-02-132-14/+14
| * | | | SI-6642 Refactor mutable.TreeSet to use RedBlackTree instead of AVLJames Iry2013-02-134-79/+223
| * | | | SI-6642 Adds iteratorFrom, keysIteratorFrom, and valuesIteratorFromJames Iry2013-02-1311-10/+177
| * | | | SI-6642 Code cleanup on RedBlackTree#TreeIteratorJames Iry2013-02-131-21/+24
|/ / / /
* | | | Merge pull request #2124 from adriaanm/76f167388a42e9bb8b72645d87bcb408b6981576Grzegorz Kossakowski2013-02-1213-16/+102
|\ \ \ \
| * | | | Merge remote-tracking branch 'scala/2.10.x' into patmat-refactor-masterAdriaan Moors2013-02-1213-16/+102
| |\| | |
| | * | | Merge pull request #2113 from scalamacros/topic/silencePaul Phillips2013-02-112-1/+7
| | |\ \ \
| | | * | | silences t6323aEugene Burmako2013-02-112-1/+7
| | * | | | Merge pull request #2111 from retronym/2.10.xJames Iry2013-02-113-8/+26
| | |\ \ \ \
| | | * | | | SI-6514 Avoid spurious dead code warningsJason Zaugg2013-02-103-8/+26
| | | | |/ / | | | |/| |
| | * | | | Merge pull request #2102 from retronym/topic/tree-checker-leniancyJames Iry2013-02-111-0/+3
| | |\ \ \ \
| | | * | | | Tolerate symbol sharing between accessor/field.Jason Zaugg2013-02-091-0/+3
| | | |/ / /
| | * | | | Merge pull request #2098 from retronym/ticket/6225James Iry2013-02-112-1/+28
| | |\ \ \ \
| | | * | | | SI-6225 Fix import of inherited package object implicitsJason Zaugg2013-02-092-1/+28
| | * | | | | Merge pull request #2097 from ViniciusMiana/SI-6935James Iry2013-02-112-0/+16
| | |\ \ \ \ \
| | | * | | | | SI-6935 Added readResolve in BoxedUnitVinicius Miana2013-02-082-0/+16
| | | |/ / / /
| | * | | | | Merge pull request #2096 from ViniciusMiana/SI-6370James Iry2013-02-112-2/+18
| | |\ \ \ \ \
| | | * | | | | SI-6370 changed ListMap apply0 method to produce correct error message when a...Vinicius Miana2013-02-082-2/+18
| | * | | | | | Merge pull request #2099 from retronym/ticket/6158Paul Phillips2013-02-111-1/+1
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | SI-6158 Restore compile error output under partest --show-logJason Zaugg2013-02-091-1/+1
| | | | |/ / / | | | |/| | |
* | | | | | | Merge pull request #2077 from vy/patch-3James Iry2013-02-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update src/library/scala/sys/process/package.scalaVolkan Yazıcı2013-02-061-1/+1
* | | | | | | Merge pull request #2057 from paulp/pr/revert-6355Paul Phillips2013-02-124-8/+32
|\ \ \ \ \ \ \
| * | | | | | | SI-6355, weakend implementation restriction on applyDynamic.Paul Phillips2013-02-124-8/+32
* | | | | | | | Merge pull request #1999 from paulp/pr/predef-maintenancePaul Phillips2013-02-1287-665/+752
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |