Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2180 from adriaanm/merge-2.10.1-master | Adriaan Moors | 2013-03-01 | 8 | -0/+80 |
|\ | |||||
| * | Merge branch 2.10.1 into master | Adriaan Moors | 2013-02-27 | 8 | -0/+80 |
| |\ | |||||
| | * | Merge 2.10.1 into 2.10.x. | Adriaan Moors | 2013-02-27 | 9 | -55/+119 |
| | |\ | |||||
| | | * | 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 |
| | | * | | SI-7180 Fix regression in implicit scope of HK type alias. | Jason Zaugg | 2013-02-25 | 1 | -0/+13 |
| | | |/ | |||||
| | | * | Merge pull request #2152 from retronym/topic/annotatedRetyping-2.10.1 | Adriaan Moors | 2013-02-21 | 4 | -0/+82 |
| | | |\ | |||||
| | | | * | 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 | 2 | -0/+68 |
| | | * | | SI-7146 - Fixing checkinit bug in ExecutionContextImpl and adding test | Viktor Klang | 2013-02-19 | 2 | -0/+28 |
| | | * | | SI-7128 Fix regression in copyToArray for empty arrays | Jason Zaugg | 2013-02-14 | 1 | -0/+3 |
| | | |/ | |||||
| | | * | [nomaster] Revert "SI-6548 reflection now correctly enters jinners" | Adriaan Moors | 2013-02-10 | 4 | -40/+75 |
| | | * | [nomaster] Revert "SI-4664 Make scala.util.Random Serializable" | Adriaan Moors | 2013-02-09 | 1 | -15/+0 |
| | * | | Merge pull request #2134 from scalamacros/topic/resetattrs-this | Paul Phillips | 2013-02-27 | 2 | -0/+12 |
| | |\ \ | |||||
| | | * | | resetAttrs now always erases This.tpe | Eugene Burmako | 2013-02-17 | 2 | -0/+12 |
| | * | | | Merge pull request #2149 from khernyo/issue/7074 | Grzegorz Kossakowski | 2013-02-25 | 2 | -0/+24 |
| | |\ \ \ | |||||
| | | * | | | SI-7074 Fix xml attribute sorting | Szabolcs Berecz | 2013-02-24 | 2 | -0/+24 |
| | * | | | | 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 |
| | | |/ / / | |||||
* | | | | | | Merge pull request #2177 from JamesIry/master_SI-7159 | Grzegorz Kossakowski | 2013-02-28 | 2 | -0/+9 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | SI-7159 Prepare to remove erroneous INT <:< LONG in TypeKinds | James Iry | 2013-02-26 | 2 | -0/+9 |
* | | | | | | Merge pull request #2170 from rkuhn/wip-duration-sleep-∂π | James Iry | 2013-02-26 | 1 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | relax time constraint in duration-tck.scala (for Windows VMs) | Roland | 2013-02-26 | 1 | -2/+3 |
* | | | | | | | Merge pull request #2169 from JamesIry/master_SI-7181 | Grzegorz Kossakowski | 2013-02-26 | 5 | -75/+226 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | SI-7181 Eliminate unnecessary duplication of finally blocks | James Iry | 2013-02-26 | 3 | -75/+125 |
| * | | | | | | SI-7181 Prepare to remove duplicated finally blocks | James Iry | 2013-02-25 | 2 | -0/+101 |
| |/ / / / / | |||||
* | | | | | | SI-7006 Simplify jump-only block destination determination | James Iry | 2013-02-25 | 2 | -4/+6 |
* | | | | | | SI-7006 Eliminate unreachable blocks | James Iry | 2013-02-25 | 3 | -0/+28 |
* | | | | | | SI-7006 Recognize more jump only blocks | James Iry | 2013-02-25 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #2161 from scalamacros/topic/7112-followup-master | James Iry | 2013-02-24 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fixes the test for SI-7112 | Eugene Burmako | 2013-02-23 | 1 | -1/+1 |
* | | | | | | Merge pull request #2125 from retronym/ticket/7120 | Paul Phillips | 2013-02-23 | 6 | -0/+52 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-7120 Erasure must honor typeref prefixes | Jason Zaugg | 2013-02-14 | 6 | -0/+52 |
* | | | | | | | Merge remote-tracking branch 'origin/2.10.x' into master | Paul Phillips | 2013-02-23 | 7 | -0/+62 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | SI-7171 Consider prefix when assessing type finality. | Jason Zaugg | 2013-02-22 | 7 | -0/+67 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #2147 from JamesIry/master_SI-7015 | Grzegorz Kossakowski | 2013-02-22 | 2 | -0/+60 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | SI-7015 Cleanup from review of null duplication | James Iry | 2013-02-22 | 1 | -1/+1 |
| * | | | | | SI-7015 Removes redundant aconst_null; pop; aconst_null creation | James Iry | 2013-02-21 | 2 | -0/+60 |
* | | | | | | Merge pull request #2154 from viktorklang/wip-SI7164-nonfatal-notimplementede... | James Iry | 2013-02-22 | 2 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-7164 - Removing NotImplementedError as Fatal from s.u.c.NonFatal | Viktor Klang | 2013-02-21 | 2 | -4/+4 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #2151 from adriaanm/merge-2.10.x | Paul Phillips | 2013-02-22 | 16 | -1344/+154 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | 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 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | |