Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge pull request #2191 from mergeconflict/SI-7132 | Paul Phillips | 2013-03-05 | 3 | -15/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | SI-7132 - don't discard Unit type in interpreter | Dan Rosen | 2013-03-02 | 3 | -15/+22 | |
* | | | | | | | | | | | | | Merge pull request #2187 from JamesIry/master_SI-6816 | Paul Phillips | 2013-03-05 | 4 | -1/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | SI-6816 Deprecate -Yeta-expand-keeps-star | James Iry | 2013-03-01 | 4 | -1/+15 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #2196 from paulp/pr/logging-and-typevars | Paul Phillips | 2013-03-05 | 6 | -86/+105 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Cleanup in isHKSubType0. | Paul Phillips | 2013-03-04 | 1 | -38/+35 | |
| * | | | | | | | | | | | | Add some logging to sinful typevar methods. | Paul Phillips | 2013-03-04 | 3 | -48/+58 | |
| * | | | | | | | | | | | | Added methods debuglogResult and devWarningResult. | Paul Phillips | 2013-03-04 | 1 | -0/+10 | |
| * | | | | | | | | | | | | Always at least log devWarnings. | Paul Phillips | 2013-03-04 | 1 | -0/+2 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #2192 from paulp/pr/rename-type-param | Adriaan Moors | 2013-03-03 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Renamed type param to be consistent with convention. | Paul Phillips | 2013-03-03 | 1 | -5/+5 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #2163 from paulp/pr/as-seen-from | Adriaan Moors | 2013-03-03 | 2 | -132/+201 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Establishes what's up with widening in asSeenFrom. | Paul Phillips | 2013-03-03 | 1 | -6/+10 | |
| * | | | | | | | | | | | Simplified correspondingTypeArgument based on reviewer feedback. | Paul Phillips | 2013-03-02 | 1 | -15/+10 | |
| * | | | | | | | | | | | Refactors AsSeenFromMap to expose extension point. | Paul Phillips | 2013-03-01 | 2 | -131/+201 | |
* | | | | | | | | | | | | Merge pull request #2180 from adriaanm/merge-2.10.1-master | Adriaan Moors | 2013-03-01 | 15 | -26/+154 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 2.10.1 into master | Adriaan Moors | 2013-02-27 | 15 | -26/+154 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge 2.10.1 into 2.10.x. | Adriaan Moors | 2013-02-27 | 33 | -479/+878 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | / / / / | | | | |_|_|_|/ / / / | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Merge pull request #2160 from scalamacros/topic/7112-followup-2101v2.10.1-RC2 | Adriaan Moors | 2013-02-25 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | fixes the test for SI-7112 | Eugene Burmako | 2013-02-23 | 1 | -1/+1 | |
| | | | | |_|_|_|/ / / | | | | |/| | | | | | | ||||||
| | | * | | | | | | | | Merge pull request #2166 from retronym/ticket/7180 | Adriaan Moors | 2013-02-25 | 2 | -1/+14 | |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
| | | | * | | | | | | | SI-7180 Fix regression in implicit scope of HK type alias. | Jason Zaugg | 2013-02-25 | 2 | -1/+14 | |
| | | |/ / / / / / / | ||||||
| | | * | | | | | | | Merge pull request #2152 from retronym/topic/annotatedRetyping-2.10.1 | Adriaan Moors | 2013-02-21 | 5 | -9/+87 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | Additional test case for Lukas' fix to annotated originals. | Jason Zaugg | 2013-02-21 | 2 | -0/+14 | |
| | | | * | | | | | | | Fix typing idempotency bug with Annotated trees | Lukas Rytz | 2013-02-21 | 3 | -9/+73 | |
| | | * | | | | | | | | Merge pull request #2138 from retronym/ticket/6576-null-strikes-back | James Iry | 2013-02-19 | 1 | -2/+6 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | SI-6576 Workaround / diagnostic for IDE NPE. | Jason Zaugg | 2013-02-19 | 1 | -2/+6 | |
| | | | |/ / / / / / / | ||||||
| | | * | | | | | | | | Merge pull request #2140 from viktorklang/wip-init-bug-executioncontextimpl-2... | James Iry | 2013-02-19 | 3 | -4/+32 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | SI-7146 - Fixing checkinit bug in ExecutionContextImpl and adding test | Viktor Klang | 2013-02-19 | 3 | -4/+32 | |
| | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Merge pull request #2128 from retronym/ticket/7128 | James Iry | 2013-02-19 | 2 | -1/+4 | |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
| | | | * | | | | | | | SI-7128 Fix regression in copyToArray for empty arrays | Jason Zaugg | 2013-02-14 | 2 | -1/+4 | |
| | | |/ / / / / / / | ||||||
| | | * | | | | | | | Merge pull request #2122 from adriaanm/revert-pr-1403 | James Iry | 2013-02-12 | 7 | -236/+31 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | * | \ \ \ \ \ \ \ | Merge pull request #2134 from scalamacros/topic/resetattrs-this | Paul Phillips | 2013-02-27 | 3 | -9/+60 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | adds some comments to resetAttrs | Eugene Burmako | 2013-02-26 | 1 | -5/+41 | |
| | | * | | | | | | | | | resetAttrs now always erases This.tpe | Eugene Burmako | 2013-02-17 | 3 | -4/+19 | |
| | * | | | | | | | | | | Merge pull request #2117 from gkossakowski/issue/SI-7107 | Grzegorz Kossakowski | 2013-02-26 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | Fix SI-7107: scala now thinks every exception is polymorphic | Grzegorz Kossakowski | 2013-02-25 | 1 | -0/+3 | |
| | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge pull request #2149 from khernyo/issue/7074 | Grzegorz Kossakowski | 2013-02-25 | 3 | -1/+25 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | SI-7074 Fix xml attribute sorting | Szabolcs Berecz | 2013-02-24 | 3 | -1/+25 | |
| | * | | | | | | | | | | Merge pull request #2159 from scalamacros/topic/7112-followup-210x | James Iry | 2013-02-24 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | fixes the test for SI-7112 | Eugene Burmako | 2013-02-23 | 1 | -1/+1 | |
| * | | | | | | | | | | | No-op merge of [nomaster] subset of 2.10.1. | Adriaan Moors | 2013-02-27 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | check scala-swing for binary compatibility | Adriaan Moors | 2013-02-12 | 1 | -0/+31 | |
| | * | | | | | | | | | | [nomaster] Revert "Added a Swing ColorChooser wrapper" | Adriaan Moors | 2013-02-12 | 3 | -120/+0 | |
| | * | | | | | | | | | | [nomaster] Revert "Added a Swing PopupMenu wrapper" | Adriaan Moors | 2013-02-12 | 3 | -116/+0 | |
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge pull request #2103 from adriaanm/bin-compatv2.10.1-RC1 | Adriaan Moors | 2013-02-11 | 20 | -236/+792 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | [nomaster] Revert "SI-6548 reflection now correctly enters jinners" | Adriaan Moors | 2013-02-10 | 7 | -64/+99 | |
| | | * | | | | | | | | | [nomaster] inline importPrivateWithinFromJavaFlags into SymbolTable | Adriaan Moors | 2013-02-09 | 3 | -28/+19 | |
| | | * | | | | | | | | | [nomaster] Revert "cosmetic renamings in runtime reflection" | Adriaan Moors | 2013-02-09 | 4 | -54/+54 | |
| | | * | | | | | | | | | [nomaster] refactor AdaptedForkJoinTask, uncaughtExceptionHandler | Adriaan Moors | 2013-02-09 | 2 | -28/+25 |