summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2562 from som-snytt/issue/double-pluginv2.11.0-M3Jason Zaugg2013-05-2064-150/+137
|\
| * SI-7494 Tests for status quoSom Snytt2013-05-1963-143/+133
| * SI-7494 Each plugin must only be instantiated once.Som Snytt2013-05-181-7/+4
* | Merge pull request #2566 from paulp/pr/nondeterminismPaul Phillips2013-05-194-3/+8
|\ \
| * | An attempt to make tests deterministic.Paul Phillips2013-05-194-3/+8
|/ /
* | Merge pull request #2565 from paulp/issue/7427Paul Phillips2013-05-194-19/+22
|\ \
| * | SI-7427 stop crashing under -Ydebug.Paul Phillips2013-05-194-19/+22
|/ /
* | Merge pull request #2556 from adriaanm/merge-2.10.xAdriaan Moors2013-05-1712-17/+65
|\ \
| * | Merge 2.10.x into masterAdriaan Moors2013-05-1712-17/+65
|/| |
| * | Merge pull request #2540 from adriaanm/ticket-7201v2.10.2-RC1Adriaan Moors2013-05-174-1/+12
| |\ \
| | * | SI-7201 scaladoc url in scala-(library,actors,swing,reflect) pomAdriaan Moors2013-05-174-1/+12
| * | | Merge pull request #2530 from kzys/jira-6424Adriaan Moors2013-05-171-9/+25
| |\ \ \
| | * | | SI-6424 Scaladoc: Use mapNodes.get(_) to avoid NoSuchElementExceptionKato Kazuyoshi2013-05-151-9/+25
| * | | | Merge pull request #2549 from vigdorchik/slash_slashAdriaan Moors2013-05-171-4/+1
| |\ \ \ \
| | * | | | Prevent slash duplication.Eugene Vigdorchik2013-05-171-4/+1
| * | | | | Merge pull request #2536 from adriaanm/ticket-7359Adriaan Moors2013-05-176-81/+32
| |\ \ \ \ \
| | * | | | | [backport #1727] SI-7359 cyclic nested java classAdriaan Moors2013-05-166-81/+32
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #2553 from paulp/issue/7486Adriaan Moors2013-05-172-3/+15
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | SI-7486 regression in implicit resolution.Paul Phillips2013-05-172-3/+15
| |/ / / /
| * | | | Merge pull request #2550 from scalamacros/2.10.xJason Zaugg2013-05-171-0/+3
| |\ \ \ \
| | * | | | [nomaster] unbreaks test.bcEugene Burmako2013-05-171-0/+3
| |/ / / /
* | | | | Merge pull request #2555 from soc/SI-7492Adriaan Moors2013-05-173-217/+113
|\ \ \ \ \
| * | | | | SI-7492 Remove -Ystruct-dispatch and associated codeSimon Ochsenreither2013-05-173-217/+113
* | | | | | Merge pull request #2518 from paulp/issue/1786Adriaan Moors2013-05-174-35/+59
|\ \ \ \ \ \
| * | | | | | No bounds-driven inference for the named.Paul Phillips2013-05-143-8/+12
| * | | | | | SI-1786 incorporate defined bounds in inferencePaul Phillips2013-05-125-40/+60
* | | | | | | Merge pull request #2541 from rjolly/scripting11Adriaan Moors2013-05-171-1/+9
|\ \ \ \ \ \ \
| * | | | | | | ScriptEngine.eval() forwards Error instead of new ScriptExceptionRaphael Jolly2013-05-161-1/+9
* | | | | | | | Merge pull request #2544 from viktorklang/wip-normalize-parameter-names-in-sc...Adriaan Moors2013-05-174-31/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Deprecate parameter names in scala.concurrentViktor Klang2013-05-164-31/+31
* | | | | | | | | Merge pull request #2539 from soc/SI-7484Adriaan Moors2013-05-175-48/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SI-7484 Indentation and whitespace fixesSimon Ochsenreither2013-05-175-51/+30
| * | | | | | | | | SI-7484 Add @SupressWarning(rawtypes/unchecked)Simon Ochsenreither2013-05-173-0/+4
* | | | | | | | | | Merge pull request #2538 from som-snytt/issue/6488-process-io-destroyAdriaan Moors2013-05-174-15/+75
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SI-6488 Interrupt i/o threads on process destroySom Snytt2013-05-154-15/+75
* | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 04:07:07 +0000