Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add :kind command to REPL | Eugene Yokota | 2013-04-20 | 2 | -0/+44 |
* | | | | | | | Merge pull request #2545 from paulp/issue/7482a | Paul Phillips | 2013-05-17 | 2 | -0/+22 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | SI-7482 Don't cook raw types after erasure. | Paul Phillips | 2013-05-16 | 2 | -0/+22 |
* | | | | | | | Merge pull request #2454 from vigdorchik/scaladoc_fixes | Jason Zaugg | 2013-05-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Improve code style in the Scaladoc implementation. | Eugene Vigdorchik | 2013-05-16 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #2374 from adriaanm/ticket-6815 | Jason Zaugg | 2013-05-17 | 6 | -0/+74 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | SI-6815 untangle isStable and hasVolatileType | Adriaan Moors | 2013-05-16 | 6 | -0/+74 |
* | | | | | | | | Merge pull request #2519 from som-snytt/issue/regex-revert | Adriaan Moors | 2013-05-16 | 1 | -5/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-6406 Restore deprecated API | Som Snytt | 2013-05-12 | 1 | -5/+4 |
* | | | | | | | | | Merge pull request #2534 from retronym/ticket/3943 | Adriaan Moors | 2013-05-16 | 2 | -0/+21 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | SI-3943 Test case for already-fixed Java interop bug | Jason Zaugg | 2013-05-15 | 2 | -0/+21 |
| |/ / / / / / / / | |||||
* | / / / / / / / | SI-7469 Remove @deprecated scala.util.logging | Simon Ochsenreither | 2013-05-16 | 3 | -8/+1 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #2514 from scalamacros/topic/5923-master | Jason Zaugg | 2013-05-15 | 18 | -2/+117 |
|\ \ \ \ \ \ \ \ |