summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2554 from paulp/merge/v2.10.1-326-g4f8c306-to-masterAdriaan Moors2013-05-1773-1291/+2518
|\
| * Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-masterJason Zaugg2013-05-172891-80543/+42569
| |\
| * \ Merge pull request #2504 from scalamacros/ticket/7464Jason Zaugg2013-05-174-14/+8
| |\ \
| | * | SI-7464 allows FieldMirror.set to update valsEugene Burmako2013-05-174-14/+8
| * | | Merge pull request #2497 from scalamacros/topic/macro-qqqJason Zaugg2013-05-177-21/+66
| |\ \ \
| | * | | easy way of writing not implemented macrosEugene Burmako2013-05-127-21/+66
| * | | | Merge pull request #2547 from paulp/issue/bogus-warningJason Zaugg2013-05-161-2/+1
| |\ \ \ \
| | * | | | Fix for unreachable code warning.Paul Phillips2013-05-161-2/+1
| |/ / / /
| * | | | Merge pull request #2537 from adriaanm/ticket-5886Paul Phillips2013-05-162-22/+19
| |\ \ \ \
| | * | | | SI-5886 Remove check for packed type conformance.Jason Zaugg2013-05-152-22/+19
| * | | | | Merge pull request #2515 from heathermiller/issue/6555Adriaan Moors2013-05-151-7/+10
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Actual SI-6555 fix, Scaladoc filter works WITH keyboard shortcuts tooHeather Miller2013-05-121-7/+10
| * | | | | Merge pull request #2502 from viktorklang/wip-SI7383-EC-prepare-in-Future-app...Adriaan Moors2013-05-142-1/+20
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | SI-7383 - Call ExecutionContext.prepare in Future.apply to allow for capturin...Viktor Klang2013-05-102-1/+20
| * | | | | Merge pull request #2500 from phaller/topic/forkjoin-updateJason Zaugg2013-05-126-1085/+1964
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | SI-7442 Update bundled Fork/Join pool (JSR166y)Philipp Haller2013-05-116-1085/+1964
| * | | | | Merge pull request #2494 from scalamacros/ticket/5923Eugene Burmako2013-05-1155-72/+466
| |\ \ \ \ \
| | * | | | | [nomaster] removes duplication in inferImplicitValueEugene Burmako2013-05-113-50/+28
| | * | | | | [nomaster] SI-7166 catches DivergentImplicit in c.inferImplicitXXXEugene Burmako2013-05-115-20/+71
| | * | | | | [nomaster] SI-7047 fixes silent for c.inferImplicitXXXEugene Burmako2013-05-115-2/+30
| | * | | | | [nomaster] SI-7291: No exception throwing for diverging implicit expansionHubert Plociniczak2013-05-1117-14/+171
| | * | | | | [nomaster] SI-7167 implicit macros decide what is divergenceEugene Burmako2013-05-1113-16/+102
| | * | | | | [nomaster] macroExpandAll is now triggered in all invocations of typedEugene Burmako2013-05-114-5/+17
| | * | | | | [nomaster] SI-5923 instantiates targs in deferred macro applicationsEugene Burmako2013-05-1116-11/+93
| | * | | | | [nomaster] temporarily breaks SI-5353Eugene Burmako2013-05-112-0/+0
| | |/ / / /
| * | | | | Merge pull request #2496 from igormoreno/2.10.xPaul Phillips2013-05-111-1/+1
| |\ \ \ \ \
| | * | | | | Scaladoc: fixing small typo in PartialFunction.scalaIgor Moreno2013-05-051-1/+1
| * | | | | | Merge pull request #2505 from scalamacros/topic/macrosPaul Phillips2013-05-115-31/+67
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | pull request feedbackEugene Burmako2013-05-112-6/+9
| | * | | | | replaces inferBootClasspath with a simple lookup at sun.boot.class.pathEugene Burmako2013-05-091-12/+1
| | * | | | | removes the traces of always on debug diagnosticsEugene Burmako2013-05-092-21/+21
| | * | | | | fixes a crash in ReflectionUtils.systemPropertiesEugene Burmako2013-05-093-2/+46
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #2513 from scalamacros/topic/210x-breakageGrzegorz Kossakowski2013-05-111-1/+1
| |\ \ \ \ \
| | * | | | | fixes a checkfile breakage in 2.10.xEugene Burmako2013-05-111-1/+1
| |/ / / / /
| * | | | | Merge pull request #2481 from martinmcnulty/socket-timeoutGrzegorz Kossakowski2013-05-111-2/+27
| |\ \ \ \ \
| | * | | | | SI-5734 Allow setting of socket timeout for remote actorsMartin McNulty2013-05-031-2/+27
| * | | | | | Merge pull request #2456 from paulp/pr/jdk8-210xGrzegorz Kossakowski2013-05-1116-23/+84
| |\ \ \ \ \ \
| | * | | | | | SI-7398 Add support for java8 default methodsPaul Phillips2013-04-266-7/+54
| | * | | | | | Refactor DirectTest so java can be tested.Paul Phillips2013-04-2610-16/+30
| * | | | | | | Merge pull request #2461 from scalamacros/ticket/7325Paul Phillips2013-05-1015-66/+223
| |\ \ \ \ \ \ \
| | * | | | | | | literal() now assigns a position to the tree it producesEugene Burmako2013-05-041-31/+32
| | * | | | | | | SI-7325 cleans up corner cases of percent handling in StringContext.fEugene Burmako2013-05-049-33/+141
| | * | | | | | | SI-7271 fixes positions of string interpolation partsEugene Burmako2013-04-276-6/+54
| | |/ / / / / /
| * | | | | | | Merge pull request #2458 from paulp/issue/7426-210Grzegorz Kossakowski2013-05-102-1/+3
| |\ \ \ \ \ \ \
| | * | | | | | | SI-7426 Crash in pickler.Paul Phillips2013-04-262-1/+3
| * | | | | | | | Merge pull request #2473 from paulp/pr/2.10.2/5634Paul Phillips2013-05-101-32/+21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | SI-5634 eliminate overly verbose error messagePaul Phillips2013-04-301-32/+21
| * | | | | | | | | Merge pull request #2488 from paulp/issue/7441Paul Phillips2013-05-103-6/+28
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | SI-7441 Don't ramble on about inapplicable implicits.Paul Phillips2013-05-023-6/+28
| * | | | | | | | | Merge pull request #2472 from paulp/pr/2.10.2/7385Paul Phillips2013-05-074-4/+25
| |\ \ \ \ \ \ \ \ \