summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'ad845ff' into merge/2.10.x-to-2.11.x-20150224Jason Zaugg2015-02-244-12/+82
|\
| * Merge pull request #4289 from retronym/ticket/8689Grzegorz Kossakowski2015-02-154-14/+84
| |\
| | * SI-8689 Avoid internal error in Promise after sequence of completionsViktor Klang2015-02-044-14/+84
* | | Merge commit 'fbbd1b2' into merge/2.10.x-to-2.11.x-20150224Jason Zaugg2015-02-240-0/+0
|\| |
| * | Merge pull request #4303 from milessabin/topic/backport-7753Grzegorz Kossakowski2015-02-155-37/+123
| |\ \ | | |/ | |/|
| | * Backported fix for SI-7753 to 2.10.x.Miles Sabin2015-02-095-37/+123
| |/
| * Merge pull request #4290 from adriaanm/2.10.xJason Zaugg2015-02-047-0/+856
| |\
| | * New CI validation scriptsAdriaan Moors2015-02-037-0/+856
| |/
| * Merge pull request #4186 from som-snytt/issue/9027-backportGrzegorz Kossakowski2014-12-083-6/+16
| |\
| | * SI-9027 Backport xml parser fixSom Snytt2014-12-043-6/+16
| |/
* | Merge pull request #4340 from retronym/topic/infix-completionAdriaan Moors2015-02-1911-6/+425
|\ \
| * | Remove incorrect completions: implicits can't add type membersJason Zaugg2015-02-173-5/+3
| * | SI-9153 More complete and stable results for completionsJason Zaugg2015-02-1710-4/+424
| * | Cache name for dummy argument used in implicit searchJason Zaugg2015-02-172-1/+2
* | | Merge pull request #4337 from Ichoran/opt-IterLike-2.11.xAdriaan Moors2015-02-191-6/+6
|\ \ \
| * | | Optimization of IterableLike.scalaRex Kerr2015-02-161-6/+6
| |/ /
* | | Merge pull request #4330 from Ichoran/issue/8917Adriaan Moors2015-02-192-2/+13
|\ \ \
| * | | SI-8917 collection.mutable.BitSet's &= operator doesn't clear endRex Kerr2015-02-132-2/+13
| |/ /
* | | Merge pull request #4319 from axel22/fix-si-7943Adriaan Moors2015-02-193-0/+61
|\ \ \
| * | | Fix SI-7943 -- make `TrieMap.getOrElseUpdate` atomic.Aleksandar Prokopec2015-02-183-0/+61
* | | | Merge pull request #4345 from retronym/topic/scaladoc-test-java8Adriaan Moors2015-02-191-0/+8
|\ \ \ \
| * | | | Fix the Scaladoc tests under Java 8Jason Zaugg2015-02-191-0/+8
* | | | | Merge pull request #4346 from retronym/ticket/9164Grzegorz Kossakowski2015-02-195-40/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | SI-9164 Fix thread safety of Scaladoc diagram generatorJason Zaugg2015-02-195-40/+18
|/ / / /
* | | | Merge pull request #4326 from JustinPihony/ticket/9148Adriaan Moors2015-02-182-3/+15
|\ \ \ \
| * | | | SI-9148: Appends companion type to link tooltipsJustinPihony2015-02-122-3/+15
* | | | | Merge pull request #4329 from adriaanm/followup-4235Adriaan Moors2015-02-183-30/+50
|\ \ \ \ \
| * | | | | Correct dependency for test.junit.compAdriaan Moors2015-02-181-10/+2
| * | | | | Use if/then/else to avoid box(unbox(_))Adriaan Moors2015-02-182-15/+43
| * | | | | Simplify `ClassTag.unapply`Adriaan Moors2015-02-131-16/+16
| * | | | | Scala.js-friendly `ClassTag.unapply`Sébastien Doeraene2015-02-131-2/+2
* | | | | | Merge pull request #4335 from lylek/issue/4959Adriaan Moors2015-02-181-21/+18
|\ \ \ \ \ \
| * | | | | | SI-4959 - UNIX bin scripts now work for paths with spacesLyle Kopnicky2015-02-151-21/+18
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4309 from som-snytt/issue/9116-bAdriaan Moors2015-02-183-4/+10
|\ \ \ \ \ \
| * | | | | | SI-9116 Set.subsets has a param listSom Snytt2015-02-093-4/+10
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4299 from michaelpigg/si-7660Adriaan Moors2015-02-181-7/+21
|\ \ \ \ \ \
| * | | | | | SI-7660: Document behaviour of Set#++ for duplicate elementsMichael Pigg2015-02-101-7/+21
* | | | | | | Merge pull request #4341 from retronym/ticket/9157Adriaan Moors2015-02-183-6/+18
|\ \ \ \ \ \ \
| * | | | | | | SI-9157 Avoid exponential blowup with chained type projectionsJason Zaugg2015-02-183-6/+18
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4328 from adriaanm/rework-4230Adriaan Moors2015-02-173-2/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | SI-9059 Random.alphanumeric is inefficientDenton Cockburn2015-02-133-2/+28
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4296 from lrytz/t9105Adriaan Moors2015-02-1321-104/+791
|\ \ \ \ \ \
| * | | | | | Test java reflection on scala library / reflect / compiler jarsLukas Rytz2015-02-073-1/+68
| * | | | | | IntelliJ project file fixLukas Rytz2015-02-071-0/+1
| * | | | | | Fix InnerClass / EnclosingMethod for closures nested in value classesLukas Rytz2015-02-0710-38/+189
| * | | | | | Fix InnerClass/EnclosingMethod for trait impl and specialized classesLukas Rytz2015-02-077-41/+214
| * | | | | | SI-9124 fix EnclosingMethod of classes nested in implOnly trait defsLukas Rytz2015-02-073-1/+53
| * | | | | | SI-9105 Fix EnclosingMethod for classes defined in lambdasLukas Rytz2015-02-0712-43/+286
* | | | | | | Merge pull request #4304 from adriaanm/rebase-4219Adriaan Moors2015-02-133-27/+30
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | SI-8818 FreshName extractor forgives suffixSom Snytt2015-02-093-27/+30
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 05:56:52 +0000