summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge pull request #2187 from JamesIry/master_SI-6816Paul Phillips2013-03-054-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | SI-6816 Deprecate -Yeta-expand-keeps-starJames Iry2013-03-014-1/+15
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #2196 from paulp/pr/logging-and-typevarsPaul Phillips2013-03-056-86/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Cleanup in isHKSubType0.Paul Phillips2013-03-041-38/+35
| * | | | | | | | | | | | Add some logging to sinful typevar methods.Paul Phillips2013-03-043-48/+58
| * | | | | | | | | | | | Added methods debuglogResult and devWarningResult.Paul Phillips2013-03-041-0/+10
| * | | | | | | | | | | | Always at least log devWarnings.Paul Phillips2013-03-041-0/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #2192 from paulp/pr/rename-type-paramAdriaan Moors2013-03-031-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Renamed type param to be consistent with convention.Paul Phillips2013-03-031-5/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #2163 from paulp/pr/as-seen-fromAdriaan Moors2013-03-032-132/+201
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Establishes what's up with widening in asSeenFrom.Paul Phillips2013-03-031-6/+10
| * | | | | | | | | | | Simplified correspondingTypeArgument based on reviewer feedback.Paul Phillips2013-03-021-15/+10
| * | | | | | | | | | | Refactors AsSeenFromMap to expose extension point.Paul Phillips2013-03-012-131/+201
* | | | | | | | | | | | Merge pull request #2180 from adriaanm/merge-2.10.1-masterAdriaan Moors2013-03-0115-26/+154
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 2.10.1 into masterAdriaan Moors2013-02-2715-26/+154
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge 2.10.1 into 2.10.x.Adriaan Moors2013-02-2733-479/+878
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | / / / / | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge pull request #2160 from scalamacros/topic/7112-followup-2101v2.10.1-RC2Adriaan Moors2013-02-251-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | fixes the test for SI-7112Eugene Burmako2013-02-231-1/+1
| | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | * | | | | | | | Merge pull request #2166 from retronym/ticket/7180Adriaan Moors2013-02-252-1/+14
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | SI-7180 Fix regression in implicit scope of HK type alias.Jason Zaugg2013-02-252-1/+14
| | | |/ / / / / / /
| | | * | | | | | | Merge pull request #2152 from retronym/topic/annotatedRetyping-2.10.1Adriaan Moors2013-02-215-9/+87
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Additional test case for Lukas' fix to annotated originals.Jason Zaugg2013-02-212-0/+14
| | | | * | | | | | | Fix typing idempotency bug with Annotated treesLukas Rytz2013-02-213-9/+73
| | | * | | | | | | | Merge pull request #2138 from retronym/ticket/6576-null-strikes-backJames Iry2013-02-191-2/+6
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | SI-6576 Workaround / diagnostic for IDE NPE.Jason Zaugg2013-02-191-2/+6
| | | | |/ / / / / / /
| | | * | | | | | | | Merge pull request #2140 from viktorklang/wip-init-bug-executioncontextimpl-2...James Iry2013-02-193-4/+32
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | SI-7146 - Fixing checkinit bug in ExecutionContextImpl and adding testViktor Klang2013-02-193-4/+32
| | | |/ / / / / / / /
| | | * | | | | | | | Merge pull request #2128 from retronym/ticket/7128James Iry2013-02-192-1/+4
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | SI-7128 Fix regression in copyToArray for empty arraysJason Zaugg2013-02-142-1/+4
| | | |/ / / / / / /
| | | * | | | | | | Merge pull request #2122 from adriaanm/revert-pr-1403James Iry2013-02-127-236/+31
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge pull request #2134 from scalamacros/topic/resetattrs-thisPaul Phillips2013-02-273-9/+60
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | adds some comments to resetAttrsEugene Burmako2013-02-261-5/+41
| | | * | | | | | | | | resetAttrs now always erases This.tpeEugene Burmako2013-02-173-4/+19
| | * | | | | | | | | | Merge pull request #2117 from gkossakowski/issue/SI-7107Grzegorz Kossakowski2013-02-261-0/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | | * | | | | | | | | Fix SI-7107: scala now thinks every exception is polymorphicGrzegorz Kossakowski2013-02-251-0/+3
| | |/ / / / / / / / /
| | * | | | | | | | | Merge pull request #2149 from khernyo/issue/7074Grzegorz Kossakowski2013-02-253-1/+25
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | SI-7074 Fix xml attribute sortingSzabolcs Berecz2013-02-243-1/+25
| | * | | | | | | | | | Merge pull request #2159 from scalamacros/topic/7112-followup-210xJames Iry2013-02-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | | * | | | | | | | | fixes the test for SI-7112Eugene Burmako2013-02-231-1/+1
| * | | | | | | | | | | No-op merge of [nomaster] subset of 2.10.1.Adriaan Moors2013-02-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | check scala-swing for binary compatibilityAdriaan Moors2013-02-121-0/+31
| | * | | | | | | | | | [nomaster] Revert "Added a Swing ColorChooser wrapper"Adriaan Moors2013-02-123-120/+0
| | * | | | | | | | | | [nomaster] Revert "Added a Swing PopupMenu wrapper"Adriaan Moors2013-02-123-116/+0
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #2103 from adriaanm/bin-compatv2.10.1-RC1Adriaan Moors2013-02-1120-236/+792
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | [nomaster] Revert "SI-6548 reflection now correctly enters jinners"Adriaan Moors2013-02-107-64/+99
| | | * | | | | | | | | [nomaster] inline importPrivateWithinFromJavaFlags into SymbolTableAdriaan Moors2013-02-093-28/+19
| | | * | | | | | | | | [nomaster] Revert "cosmetic renamings in runtime reflection"Adriaan Moors2013-02-094-54/+54
| | | * | | | | | | | | [nomaster] refactor AdaptedForkJoinTask, uncaughtExceptionHandlerAdriaan Moors2013-02-092-28/+25
| | | * | | | | | | | | [nomaster] can't add new class BatchingExecutorAdriaan Moors2013-02-093-130/+113
| | | * | | | | | | | | [nomaster] bring back SerializeStart from fa3b8040ebAdriaan Moors2013-02-092-10/+14