Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2574 from paulp/issue/3425 | Paul Phillips | 2013-05-24 | 6 | -0/+1172 |
|\ | |||||
| * | Added another test. | Paul Phillips | 2013-05-21 | 3 | -0/+1127 |
| * | SI-3425 erasure crash with refinement members. | Paul Phillips | 2013-05-21 | 3 | -0/+45 |
* | | Merge pull request #2576 from retronym/ticket/7436 | Paul Phillips | 2013-05-23 | 1 | -0/+9 |
|\ \ | |/ |/| | |||||
| * | SI-7436 Varargs awareness for super param aliasing. | Jason Zaugg | 2013-05-21 | 1 | -0/+9 |
* | | Merge commit 'd93826f278' into pr/enter-elimination-mode | Paul Phillips | 2013-05-18 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'master' into HEAD | Paul Phillips | 2013-05-16 | 15 | -2/+112 |
| |\ \ | |||||
| * | | | Corralling Modes into a smaller pen. | Paul Phillips | 2013-05-11 | 1 | -1/+1 |
* | | | | Merge 2.10.x into master | Adriaan Moors | 2013-05-17 | 4 | -0/+12 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge pull request #2536 from adriaanm/ticket-7359 | Adriaan Moors | 2013-05-17 | 5 | -75/+21 |
| |\ \ \ | |||||
| | * | | | [backport #1727] SI-7359 cyclic nested java class | Adriaan Moors | 2013-05-16 | 5 | -75/+21 |
* | | | | | Merge pull request #2538 from som-snytt/issue/6488-process-io-destroy | Adriaan Moors | 2013-05-17 | 2 | -3/+55 |
|\ \ \ \ \ | |||||
| * | | | | | SI-6488 Interrupt i/o threads on process destroy | Som Snytt | 2013-05-15 | 2 | -3/+55 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2554 from paulp/merge/v2.10.1-326-g4f8c306-to-master | Adriaan Moors | 2013-05-17 | 20 | -21/+178 |
|\ \ \ \ \ | |||||
| * | | | | | Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master | Jason Zaugg | 2013-05-17 | 429 | -1334/+4707 |
| |\| | | | | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #2504 from scalamacros/ticket/7464 | Jason Zaugg | 2013-05-17 | 2 | -10/+4 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | SI-7464 allows FieldMirror.set to update vals | Eugene Burmako | 2013-05-17 | 2 | -10/+4 |
| * | | | | Merge pull request #2494 from scalamacros/ticket/5923 | Eugene Burmako | 2013-05-11 | 17 | -0/+123 |
| |\ \ \ \ | |||||
| | * | | | | [nomaster] SI-7047 fixes silent for c.inferImplicitXXX | Eugene Burmako | 2013-05-11 | 3 | -0/+22 |
| | * | | | | [nomaster] SI-7291: No exception throwing for diverging implicit expansion | Hubert Plociniczak | 2013-05-11 | 6 | -0/+42 |
| | * | | | | [nomaster] SI-7167 implicit macros decide what is divergence | Eugene Burmako | 2013-05-11 | 3 | -0/+27 |
| | * | | | | [nomaster] SI-5923 instantiates targs in deferred macro applications | Eugene Burmako | 2013-05-11 | 5 | -0/+32 |
| * | | | | | Merge pull request #2505 from scalamacros/topic/macros | Paul Phillips | 2013-05-11 | 2 | -0/+42 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | fixes a crash in ReflectionUtils.systemProperties | Eugene Burmako | 2013-05-09 | 2 | -0/+42 |
| | |/ / / | |||||
| * | | | | fixes a checkfile breakage in 2.10.x | Eugene Burmako | 2013-05-11 | 1 | -1/+1 |
| * | | | | Merge pull request #2456 from paulp/pr/jdk8-210x | Grzegorz Kossakowski | 2013-05-11 | 9 | -8/+39 |
| |\ \ \ \ | |||||
| | * | | | | SI-7398 Add support for java8 default methods | Paul Phillips | 2013-04-26 | 1 | -0/+31 |
| | * | | | | Refactor DirectTest so java can be tested. | Paul Phillips | 2013-04-26 | 8 | -8/+8 |
| | |/ / / | |||||
| * | | | | SI-7325 cleans up corner cases of percent handling in StringContext.f | Eugene Burmako | 2013-05-04 | 4 | -2/+46 |
| * | | | | SI-7271 fixes positions of string interpolation parts | Eugene Burmako | 2013-04-27 | 2 | -0/+46 |
| |/ / / | |||||
* | | | | Merge pull request #2340 from folone/topic/kind-pr | Adriaan Moors | 2013-05-17 | 2 | -0/+44 |
|\ \ \ \ | |||||
| * | | | | Add :kind command to REPL | Eugene Yokota | 2013-04-20 | 2 | -0/+44 |
* | | | | | SI-7482 Don't cook raw types after erasure. | Paul Phillips | 2013-05-16 | 2 | -0/+22 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #2514 from scalamacros/topic/5923-master | Jason Zaugg | 2013-05-15 | 13 | -2/+83 |
|\ \ \ \ | |||||
| * | | | | SI-7047 fixes silent for c.inferImplicitXXX | Eugene Burmako | 2013-05-12 | 3 | -0/+22 |
| * | | | | SI-7167 implicit macros decide what is divergence | Eugene Burmako | 2013-05-12 | 5 | -2/+29 |
| * | | | | SI-5923 instantiates targs in deferred macro applications | Eugene Burmako | 2013-05-12 | 5 | -0/+32 |
* | | | | | Merge pull request #2503 from paulp/issue/6039 | Jason Zaugg | 2013-05-15 | 1 | -0/+18 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | SI-6039 Harden against irrelevant filesystem details | Paul Phillips | 2013-05-08 | 1 | -0/+18 |
* | | | | | Merge pull request #2470 from ihji/master | Paul Phillips | 2013-05-11 | 1 | -0/+11 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | SI-7432 add testcases | Heejong Lee | 2013-04-30 | 1 | -0/+11 |
* | | | | | Merge pull request #2462 from magarciaEPFL/backendish9 | Paul Phillips | 2013-05-10 | 1 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | SI-6863 root cause fixed using factory of scala.runtime.*Ref | Miguel Garcia | 2013-04-27 | 1 | -2/+2 |
* | | | | | Merge pull request #2483 from adriaanm/merge-2.10.x | Paul Phillips | 2013-05-02 | 1 | -0/+34 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge 2.10.x into master | Adriaan Moors | 2013-05-02 | 1 | -0/+34 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge pull request #2322 from retronym/ticket/7200 | Jason Zaugg | 2013-04-20 | 1 | -0/+34 |
| | |\ \ \ \ | |||||
| | | * | | | | SI-7200 Test case for fixed type inference error. | Jason Zaugg | 2013-03-27 | 1 | -0/+34 |
* | | | | | | | Merge pull request #2428 from hubertp/issue/7291 | Paul Phillips | 2013-04-30 | 2 | -0/+21 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | SI-7291: No exception throwing for diverging implicit expansion | Hubert Plociniczak | 2013-04-26 | 2 | -0/+21 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #2421 from paulp/pr/print-method-positions | Paul Phillips | 2013-04-27 | 2 | -0/+50 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | |