Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2562 from som-snytt/issue/double-pluginv2.11.0-M3 | Jason Zaugg | 2013-05-20 | 31 | -0/+303 |
|\ | |||||
| * | SI-7494 Tests for status quo | Som Snytt | 2013-05-19 | 31 | -0/+303 |
* | | An attempt to make tests deterministic. | Paul Phillips | 2013-05-19 | 2 | -2/+2 |
* | | SI-7427 stop crashing under -Ydebug. | Paul Phillips | 2013-05-19 | 2 | -0/+5 |
* | | Merge 2.10.x into master | Adriaan Moors | 2013-05-17 | 5 | -0/+20 |
|\ \ | |||||
| * \ | 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 |
| * | | | SI-7486 regression in implicit resolution. | Paul Phillips | 2013-05-17 | 1 | -0/+8 |
* | | | | Merge pull request #2518 from paulp/issue/1786 | Adriaan Moors | 2013-05-17 | 2 | -0/+67 |
|\ \ \ \ | |||||
| * | | | | No bounds-driven inference for the named. | Paul Phillips | 2013-05-14 | 2 | -8/+11 |
| * | | | | SI-1786 incorporate defined bounds in inference | Paul Phillips | 2013-05-12 | 3 | -5/+69 |
* | | | | | 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 | 42 | -26/+373 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master | Jason Zaugg | 2013-05-17 | 1135 | -4998/+9718 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | 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 #2497 from scalamacros/topic/macro-qqq | Jason Zaugg | 2013-05-17 | 4 | -0/+33 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | easy way of writing not implemented macros | Eugene Burmako | 2013-05-12 | 4 | -0/+33 |
| * | | | | | | | | SI-5886 Remove check for packed type conformance. | Jason Zaugg | 2013-05-15 | 1 | -0/+18 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #2502 from viktorklang/wip-SI7383-EC-prepare-in-Future-app... | Adriaan Moors | 2013-05-14 | 1 | -0/+19 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | SI-7383 - Call ExecutionContext.prepare in Future.apply to allow for capturin... | Viktor Klang | 2013-05-10 | 1 | -0/+19 |
| * | | | | | | | Merge pull request #2494 from scalamacros/ticket/5923 | Eugene Burmako | 2013-05-11 | 41 | -8/+208 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [nomaster] SI-7166 catches DivergentImplicit in c.inferImplicitXXX | Eugene Burmako | 2013-05-11 | 3 | -0/+33 |
| | * | | | | | | | [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 | 12 | -1/+60 |
| | * | | | | | | | [nomaster] SI-7167 implicit macros decide what is divergence | Eugene Burmako | 2013-05-11 | 6 | -0/+57 |
| | * | | | | | | | [nomaster] macroExpandAll is now triggered in all invocations of typed | Eugene Burmako | 2013-05-11 | 2 | -0/+4 |
| | * | | | | | | | [nomaster] SI-5923 instantiates targs in deferred macro applications | Eugene Burmako | 2013-05-11 | 13 | -0/+32 |
| | * | | | | | | | [nomaster] temporarily breaks SI-5353 | Eugene Burmako | 2013-05-11 | 2 | -7/+0 |
| * | | | | | | | | 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 |
| * | | | | | | | | Merge pull request #2461 from scalamacros/ticket/7325 | Paul Phillips | 2013-05-10 | 11 | -7/+141 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | SI-7325 cleans up corner cases of percent handling in StringContext.f | Eugene Burmako | 2013-05-04 | 7 | -3/+91 |
| | * | | | | | | | | SI-7271 fixes positions of string interpolation parts | Eugene Burmako | 2013-04-27 | 4 | -4/+50 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #2458 from paulp/issue/7426-210 | Grzegorz Kossakowski | 2013-05-10 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | SI-7426 Crash in pickler. | Paul Phillips | 2013-04-26 | 1 | -0/+3 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #2488 from paulp/issue/7441 | Paul Phillips | 2013-05-10 | 2 | -0/+13 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | SI-7441 Don't ramble on about inapplicable implicits. | Paul Phillips | 2013-05-02 | 2 | -0/+13 |
| * | | | | | | | | Merge pull request #2472 from paulp/pr/2.10.2/7385 | Paul Phillips | 2013-05-07 | 2 | -0/+17 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | SI-7385 crash in erroneous code | Paul Phillips | 2013-04-30 | 2 | -0/+17 |
| * | | | | | | | | | Merge pull request #2487 from paulp/issue/6091 | Paul Phillips | 2013-05-07 | 2 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | SI-6091 overeager warning for reference equality | Paul Phillips | 2013-05-02 | 2 | -0/+11 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #2440 from retronym/ticket/6771 | Adriaan Moors | 2013-05-03 | 4 | -0/+32 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | SI-6771 Alias awareness for checkableType in match analysis. | Jason Zaugg | 2013-04-24 | 4 | -0/+32 |
* | | | | | | | | | Merge pull request #2340 from folone/topic/kind-pr | Adriaan Moors | 2013-05-17 | 2 | -0/+44 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | |