summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4090 from retronym/ticket/8955Jason Zaugg2014-11-062-3/+21
|\
| * SI-8955 Fix hanging fork-join pool via parallel collectionsJason Zaugg2014-11-052-3/+21
|/
* Merge pull request #4042 from viktorklang/wip-sip14-updates-√Adriaan Moors2014-10-2326-431/+1105
|\
| * SI-8849 Makes `ExecutionContext.Implicits.global` ambiguousViktor Klang2014-10-203-2/+19
| * Add missing canonical combinators:Viktor Klang2014-10-2024-429/+1086
|/
* Merge pull request #4012 from retronym/merge/2.11.x-to-2.12.x-20140930Lukas Rytz2014-09-3061-818/+1476
|\
| * Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2014...Jason Zaugg2014-09-3061-818/+1476
|/|
| * Merge pull request #3996 from gourlaysama/wip/specJason Zaugg2014-09-2914-11/+690
| |\
| | * spec: a header that links to the index, with a scala logoAntoine Gourlay2014-09-236-5/+60
| | * spec: a print stylesheet to remove the TOC when printingAntoine Gourlay2014-09-232-0/+16
| | * spec: generated TOC with linkable headersAntoine Gourlay2014-09-229-7/+615
| * | Merge pull request #4009 from gourlaysama/wip/test-flagsJason Zaugg2014-09-294-4/+0
| |\ \
| | * | Cleanup a few flags in test/files/Antoine Gourlay2014-09-294-4/+0
| * | | Merge pull request #4007 from retronym/topic/bump-timeoutGrzegorz Kossakowski2014-09-291-1/+1
| |\ \ \
| | * | | Bump timeout in interactive tests from 10s -> 30s.Jason Zaugg2014-09-291-1/+1
| |/ / /
| * | | Merge pull request #4006 from retronym/topic/defragilityJason Zaugg2014-09-282-3/+2
| |\ \ \ | | |/ / | |/| |
| | * | Avoid test fragility to changes in PredefJason Zaugg2014-09-282-3/+2
| |/ /
| * | Merge pull request #4002 from retronym/merge/2.10.x-to-2.11.x-20140925Jason Zaugg2014-09-250-0/+0
| |\ \
| | * | Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.11.x-2014...Jason Zaugg2014-09-250-0/+0
| |/| |
| | * | Merge pull request #3998 from retronym/backport/7756Grzegorz Kossakowski2014-09-248-8/+69
| | |\ \
| | | * | [backport] SI-7756 Uncripple refchecks in case bodiesJason Zaugg2014-09-238-8/+69
| * | | | Merge pull request #3999 from mpociecha/classpath-findSourceFile-method-renamingGrzegorz Kossakowski2014-09-244-5/+4
| |\ \ \ \
| | * | | | Get rid of Platform.doLoad method.Grzegorz Kossakowski2014-09-241-1/+0
| | * | | | Rename ClassPath.findSourceFile to ClassPath.findClassFileGrzegorz Kossakowski2014-09-243-4/+4
| |/ / / /
| * | | | Merge pull request #3994 from puffnfresh/feature/system-compiler-propertiesGrzegorz Kossakowski2014-09-242-4/+4
| |\ \ \ \
| | * | | | Make compiler.properties fall back to prefixedBrian McKenna2014-09-222-4/+4
| * | | | | Merge pull request #3997 from krystiannowak/patch-1Jason Zaugg2014-09-231-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | HasSet to HashSet typo fixKrystian Nowak2014-09-221-1/+1
| |/ / / /
| * | | | Merge pull request #3990 from som-snytt/issue/spec-overload-titleJason Zaugg2014-09-221-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Particular formatting improvement in the specSom Snytt2014-09-191-1/+1
| |/ / /
| * | | Merge pull request #3984 from gourlaysama/wip/specJason Zaugg2014-09-1920-773/+656
| |\ \ \
| | * | | spec: fix broken links and anchors, including examplesAntoine Gourlay2014-09-176-15/+16
| | * | | spec: remove trailing whitespace everywhereAntoine Gourlay2014-09-1716-660/+497
| | * | | spec: fix latex formatting all over the placeAntoine Gourlay2014-09-179-101/+104
| | * | | spec: add syntax highlighting for scala code with highlight.jsAntoine Gourlay2014-09-173-0/+42
| | * | | spec: use the yaml title as the HTML titleAntoine Gourlay2014-09-152-4/+4
| * | | | Merge pull request #3988 from ghik/issue/8459Jason Zaugg2014-09-184-1/+32
| |\ \ \ \
| | * | | | SI-8459 fix incorrect positions for incomplete selection treesghik2014-09-174-1/+32
| * | | | | Merge pull request #3989 from retronym/ticket/8852Grzegorz Kossakowski2014-09-182-2/+37
| |\ \ \ \ \
| | * | | | | SI-8852 Support joint compilation of Java interfaces w. staticsJason Zaugg2014-09-182-2/+37
| * | | | | | Merge pull request #3974 from xeno-by/topic/buffer-pattern-expander-errorsGrzegorz Kossakowski2014-09-187-12/+44
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | This ensures that typechecking custom unapplications in silent modeEugene Burmako2014-09-117-12/+44
| * | | | | | Merge pull request #3980 from retronym/ticket/8844Lukas Rytz2014-09-172-1/+5
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | SI-8844 Fix regression with existentials + type aliasesJason Zaugg2014-09-132-1/+5
* | | | | | | Merge pull request #3987 from retronym/merge/2.11.x-to-2.12.x-20140917Lukas Rytz2014-09-1746-167/+1602
|\ \ \ \ \ \ \
| * | | | | | | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2014...Jason Zaugg2014-09-1746-167/+1602
|/| | | | | | | | |/ / / / / /
| * | | | | | Merge pull request #3848 from Ichoran/issue/8680Lukas Rytz2014-09-164-14/+198
| |\ \ \ \ \ \
| | * | | | | | SI-8680 Stream.addString is too eagerRex Kerr2014-09-124-14/+198
| * | | | | | | Merge pull request #3941 from Ichoran/issue/8815Lukas Rytz2014-09-162-27/+26
| |\ \ \ \ \ \ \
| | * | | | | | | SI-8815 mutable.LongMap makes different choices for splitAt vs etc.Rex Kerr2014-09-112-27/+26
| | | |_|/ / / / | | |/| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-11 00:02:20 +0000