summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* SI-8462: Integral shift Long result type correctedSom Snytt2015-01-092-7/+24
* Merge pull request #4175 from Ichoran/issue/7981Lukas Rytz2014-12-045-18/+59
|\
| * SI-7981 toSeq on immutable Map and Set return ArrayBufferRex Kerr2014-11-305-18/+59
|/
* Merge pull request #4156 from Ichoran/issue/8819Grzegorz Kossakowski2014-11-261-1/+18
|\
| * SI-8819 Range slice does not return a RangeRex Kerr2014-11-251-1/+18
* | Merge pull request #4157 from Ichoran/issue/8814Grzegorz Kossakowski2014-11-262-0/+36
|\ \
| * | SI-8814 mutable.LongMap loses its LongMapness when adding with +Rex Kerr2014-11-242-0/+36
| |/
* | Merge pull request #4158 from Ichoran/issue/8765Grzegorz Kossakowski2014-11-262-16/+16
|\ \
| * | SI-8765 immutable.HashSet exposes internal updated0 methodRex Kerr2014-11-242-16/+16
| |/
* | Merge pull request #4159 from Ichoran/issue/8727Grzegorz Kossakowski2014-11-262-1/+16
|\ \ | |/ |/|
| * SI-8727 Map.filterKeys result's contains and get are inconsistentRex Kerr2014-11-252-1/+16
|/
* Merge pull request #4124 from retronym/ticket/7521Grzegorz Kossakowski2014-11-215-1/+43
|\
| * SI-7521 Fix erasure of parametric value classes.Jason Zaugg2014-11-105-1/+43
* | Merge pull request #4140 from som-snytt/issue/8251Grzegorz Kossakowski2014-11-213-13/+1
|\ \
| * | SI-8251 Remove ListBuffer.readOnly as deprecatedSom Snytt2014-11-203-13/+1
* | | Merge pull request #4086 from som-snytt/issue/8835-2.12.xGrzegorz Kossakowski2014-11-213-22/+72
|\ \ \ | |/ / |/| |
| * | SI-8835 Lazier slice for IteratorSom Snytt2014-11-133-22/+72
| |/
* | Merge pull request #4001 from retronym/ticket/8862Jason Zaugg2014-11-1914-82/+140
|\ \ | |/ |/|
| * More uniform treatment of package objectsJason Zaugg2014-11-0713-85/+91
| * SI-8862 Fix treatment of inherited implicits in package objectsJason Zaugg2014-11-074-10/+62
* | Merge pull request #3981 from retronym/ticket/8575-2Lukas Rytz2014-11-074-1/+81
|\ \ | |/ |/|
| * SI-8575 Fix subtyping transitivity with aliases, compound typesJason Zaugg2014-11-074-1/+81
|/
* 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
| |/ / / /