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 | 73 | -1291/+2518 |
|\ | |||||
| * | Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master | Jason Zaugg | 2013-05-17 | 2891 | -80543/+42569 |
| |\ | |||||
| * \ | Merge pull request #2504 from scalamacros/ticket/7464 | Jason Zaugg | 2013-05-17 | 4 | -14/+8 |
| |\ \ | |||||
| | * | | SI-7464 allows FieldMirror.set to update vals | Eugene Burmako | 2013-05-17 | 4 | -14/+8 |
| * | | | Merge pull request #2497 from scalamacros/topic/macro-qqq | Jason Zaugg | 2013-05-17 | 7 | -21/+66 |
| |\ \ \ | |||||
| | * | | | easy way of writing not implemented macros | Eugene Burmako | 2013-05-12 | 7 | -21/+66 |
| * | | | | Merge pull request #2547 from paulp/issue/bogus-warning | Jason Zaugg | 2013-05-16 | 1 | -2/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fix for unreachable code warning. | Paul Phillips | 2013-05-16 | 1 | -2/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #2537 from adriaanm/ticket-5886 | Paul Phillips | 2013-05-16 | 2 | -22/+19 |
| |\ \ \ \ | |||||
| | * | | | | SI-5886 Remove check for packed type conformance. | Jason Zaugg | 2013-05-15 | 2 | -22/+19 |
| * | | | | | Merge pull request #2515 from heathermiller/issue/6555 | Adriaan Moors | 2013-05-15 | 1 | -7/+10 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Actual SI-6555 fix, Scaladoc filter works WITH keyboard shortcuts too | Heather Miller | 2013-05-12 | 1 | -7/+10 |
| * | | | | | Merge pull request #2502 from viktorklang/wip-SI7383-EC-prepare-in-Future-app... | Adriaan Moors | 2013-05-14 | 2 | -1/+20 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | SI-7383 - Call ExecutionContext.prepare in Future.apply to allow for capturin... | Viktor Klang | 2013-05-10 | 2 | -1/+20 |
| * | | | | | Merge pull request #2500 from phaller/topic/forkjoin-update | Jason Zaugg | 2013-05-12 | 6 | -1085/+1964 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | SI-7442 Update bundled Fork/Join pool (JSR166y) | Philipp Haller | 2013-05-11 | 6 | -1085/+1964 |
| * | | | | | Merge pull request #2494 from scalamacros/ticket/5923 | Eugene Burmako | 2013-05-11 | 55 | -72/+466 |
| |\ \ \ \ \ | |||||
| | * | | | | | [nomaster] removes duplication in inferImplicitValue | Eugene Burmako | 2013-05-11 | 3 | -50/+28 |
| | * | | | | | [nomaster] SI-7166 catches DivergentImplicit in c.inferImplicitXXX | Eugene Burmako | 2013-05-11 | 5 | -20/+71 |
| | * | | | | | [nomaster] SI-7047 fixes silent for c.inferImplicitXXX | Eugene Burmako | 2013-05-11 | 5 | -2/+30 |
| | * | | | | | [nomaster] SI-7291: No exception throwing for diverging implicit expansion | Hubert Plociniczak | 2013-05-11 | 17 | -14/+171 |
| | * | | | | | [nomaster] SI-7167 implicit macros decide what is divergence | Eugene Burmako | 2013-05-11 | 13 | -16/+102 |
| | * | | | | | [nomaster] macroExpandAll is now triggered in all invocations of typed | Eugene Burmako | 2013-05-11 | 4 | -5/+17 |
| | * | | | | | [nomaster] SI-5923 instantiates targs in deferred macro applications | Eugene Burmako | 2013-05-11 | 16 | -11/+93 |
| | * | | | | | [nomaster] temporarily breaks SI-5353 | Eugene Burmako | 2013-05-11 | 2 | -0/+0 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #2496 from igormoreno/2.10.x | Paul Phillips | 2013-05-11 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Scaladoc: fixing small typo in PartialFunction.scala | Igor Moreno | 2013-05-05 | 1 | -1/+1 |
| * | | | | | | Merge pull request #2505 from scalamacros/topic/macros | Paul Phillips | 2013-05-11 | 5 | -31/+67 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | pull request feedback | Eugene Burmako | 2013-05-11 | 2 | -6/+9 |
| | * | | | | | replaces inferBootClasspath with a simple lookup at sun.boot.class.path | Eugene Burmako | 2013-05-09 | 1 | -12/+1 |
| | * | | | | | removes the traces of always on debug diagnostics | Eugene Burmako | 2013-05-09 | 2 | -21/+21 |
| | * | | | | | fixes a crash in ReflectionUtils.systemProperties | Eugene Burmako | 2013-05-09 | 3 | -2/+46 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge pull request #2513 from scalamacros/topic/210x-breakage | Grzegorz Kossakowski | 2013-05-11 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | fixes a checkfile breakage in 2.10.x | Eugene Burmako | 2013-05-11 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #2481 from martinmcnulty/socket-timeout | Grzegorz Kossakowski | 2013-05-11 | 1 | -2/+27 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-5734 Allow setting of socket timeout for remote actors | Martin McNulty | 2013-05-03 | 1 | -2/+27 |
| * | | | | | | Merge pull request #2456 from paulp/pr/jdk8-210x | Grzegorz Kossakowski | 2013-05-11 | 16 | -23/+84 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-7398 Add support for java8 default methods | Paul Phillips | 2013-04-26 | 6 | -7/+54 |
| | * | | | | | | Refactor DirectTest so java can be tested. | Paul Phillips | 2013-04-26 | 10 | -16/+30 |
| * | | | | | | | Merge pull request #2461 from scalamacros/ticket/7325 | Paul Phillips | 2013-05-10 | 15 | -66/+223 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | literal() now assigns a position to the tree it produces | Eugene Burmako | 2013-05-04 | 1 | -31/+32 |
| | * | | | | | | | SI-7325 cleans up corner cases of percent handling in StringContext.f | Eugene Burmako | 2013-05-04 | 9 | -33/+141 |
| | * | | | | | | | SI-7271 fixes positions of string interpolation parts | Eugene Burmako | 2013-04-27 | 6 | -6/+54 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #2458 from paulp/issue/7426-210 | Grzegorz Kossakowski | 2013-05-10 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | SI-7426 Crash in pickler. | Paul Phillips | 2013-04-26 | 2 | -1/+3 |
| * | | | | | | | | Merge pull request #2473 from paulp/pr/2.10.2/5634 | Paul Phillips | 2013-05-10 | 1 | -32/+21 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | SI-5634 eliminate overly verbose error message | Paul Phillips | 2013-04-30 | 1 | -32/+21 |
| * | | | | | | | | | Merge pull request #2488 from paulp/issue/7441 | Paul Phillips | 2013-05-10 | 3 | -6/+28 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | SI-7441 Don't ramble on about inapplicable implicits. | Paul Phillips | 2013-05-02 | 3 | -6/+28 |
| * | | | | | | | | | Merge pull request #2472 from paulp/pr/2.10.2/7385 | Paul Phillips | 2013-05-07 | 4 | -4/+25 |
| |\ \ \ \ \ \ \ \ \ |