summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129Jason Zaugg2015-01-29463-2516/+8975
|\
| * Merge pull request #4202 from kanielc/SI-9043Grzegorz Kossakowski2014-12-152-6/+43
| |\
| | * SI-9043 ArrayBuffer.insert and insertAll are very slowDenton Cockburn2014-12-142-6/+43
| * | Merge pull request #4203 from xuwei-k/ByteCodecs-scaladocLukas Rytz2014-12-151-2/+2
| |\ \ | | |/ | |/|
| | * fix ByteCodecs scaladocxuwei-k2014-12-141-2/+2
| |/
| * Merge pull request #4078 from gbasler/topic/fix-analysis-budgetAdriaan Moors2014-12-1212-277/+673
| |\
| | * Avoid the `CNF budget exceeded` exception via smarter translation into CNF.Gerard Basler2014-10-2711-268/+646
| | * Debug printing for Any, not AnyRef, to include primitivesAdriaan Moors2014-10-261-3/+3
| | * And, Or take sets of PropsGerard Basler2014-10-263-39/+57
| * | Merge pull request #4192 from Ichoran/issue/8950Lukas Rytz2014-12-112-2/+2
| |\ \
| | * | SI-8950 SeqView and StreamView allow indexing out of a sliceRex Kerr2014-12-062-2/+2
| * | | Merge pull request #4154 from smarter/patch-1Adriaan Moors2014-12-101-0/+2
| |\ \ \
| | * | | spec: Add a link to the sources from the main pageGuillaume Martres2014-11-241-0/+2
| * | | | Merge pull request #4194 from lrytz/intellij-replAdriaan Moors2014-12-101-0/+1
| |\ \ \ \
| | * | | | intellij module repl depends on asmLukas Rytz2014-12-091-0/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #4182 from som-snytt/issue/multizeroAdriaan Moors2014-12-096-202/+175
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | SI-9015 Reject 0x and minor parser cleanupSom Snytt2014-12-056-202/+175
| * | | | Merge pull request #4169 from retronym/ticket/9008Adriaan Moors2014-12-057-2/+26
| |\ \ \ \
| | * | | | SI-9008 Fix regression with higher kinded existentialsJason Zaugg2014-12-037-2/+26
| | |/ / /
| * | | | Merge pull request #4165 from dickwall/ticket/9006Adriaan Moors2014-12-053-1/+35
| |\ \ \ \
| | * | | | SI-9006 Scaladoc: explicit companion and package linksDick Wall2014-11-263-1/+35
| * | | | | Merge pull request #4187 from jedesah/patch-1Adriaan Moors2014-12-051-1/+1
| |\ \ \ \ \
| | * | | | | Fix typoJean-Remi Desjardins2014-12-041-1/+1
| * | | | | | Merge pull request #4176 from mpociecha/flat-classpath2Grzegorz Kossakowski2014-12-0552-315/+2217
| |\ \ \ \ \ \
| | * | | | | | Turn off flat classpath by default, mark one of its classes as sealedmpociecha2014-12-052-2/+2
| | * | | | | | Add benchmarks to compare recursive and flat cp representationsmpociecha2014-12-053-1/+221
| | * | | | | | Cleanup and refactoring - semicolons, unused or commented out codempociecha2014-12-0522-61/+75
| | * | | | | | Create possibility to skip flat classpath cachingmpociecha2014-12-053-5/+14
| | * | | | | | Integrate flat classpath with the compilermpociecha2014-12-0517-68/+440
| | * | | | | | Refactor scalap's mainmpociecha2014-12-012-87/+89
| | * | | | | | Create dedicated path resolver for the flat classpath representationmpociecha2014-11-302-11/+195
| | * | | | | | Create base classpath factory and an implementation for the flat cpmpociecha2014-11-304-26/+103
| | * | | | | | Add flat classpath implementation using ManifestResourcesmpociecha2014-11-301-4/+97
| | * | | | | | Add flat classpath implementation for zip and jar filesmpociecha2014-11-305-6/+170
| | * | | | | | Add flat classpath implementation for directoriesmpociecha2014-11-304-1/+189
| | * | | | | | Add the flat classpath type aggregating flat classpath instancesmpociecha2014-11-303-0/+339
| | * | | | | | Define interface for flat classpath and add package loader using itmpociecha2014-11-303-0/+143
| | * | | | | | Use new asClassPathString method and create FileUtils for classpathmpociecha2014-11-306-42/+88
| | * | | | | | Abstract over ClassPath and ClassRepmpociecha2014-11-288-32/+83
| * | | | | | | Merge pull request #4188 from adriaanm/xml-1.0.3Grzegorz Kossakowski2014-12-051-1/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Upgrade to scala-xml v1.0.3Adriaan Moors2014-12-041-1/+1
| |/ / / / / /
| * | | | | | Merge pull request #4131 from som-snytt/issue/8981Lukas Rytz2014-12-041-28/+27
| |\ \ \ \ \ \
| | * | | | | | SI-8981 Tweak REPL helpSom Snytt2014-11-141-28/+27
| * | | | | | | Merge pull request #4168 from Ichoran/issue/9000Lukas Rytz2014-12-041-6/+9
| |\ \ \ \ \ \ \
| | * | | | | | | SI-9000 equals for immutable collections should check identityRex Kerr2014-11-261-6/+9
| * | | | | | | | Merge pull request #4141 from Ichoran/issue/8970Lukas Rytz2014-12-042-2/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | SI-8970 hashCode of BigDecimal and Double do not matchRex Kerr2014-11-212-2/+8
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge pull request #4142 from Ichoran/issue/8783Lukas Rytz2014-12-041-4/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | SI-8783 MultiMap documentation for addBinding is incorrectRex Kerr2014-11-211-4/+3
| | |/ / / / / / /
| * | | | | | | | Merge pull request #4144 from Ichoran/issue/8951Lukas Rytz2014-12-041-0/+1
| |\ \ \ \ \ \ \ \