summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4357 from retronym/merge/2.10.x-to-2.11.x-20150224v2.11.6Adriaan Moors2015-02-244-12/+82
|\
| * Merge commit 'b2f5101' into merge/2.10.x-to-2.11.x-20150224Jason Zaugg2015-02-240-0/+0
| |\
| | * Merge pull request #4307 from som-snytt/issue/4339-2.10-bGrzegorz Kossakowski2015-02-238-42/+80
| | |\
| | | * [backport] SI-9060 Backpatch fifth-edition namesSom Snytt2015-02-153-39/+25
| | | * [backport] SI-4339 Event errors and attribute fixSom Snytt2015-02-135-3/+55
| | * | Merge pull request #4351 from adriaanm/scaladoc-2.10Adriaan Moors2015-02-201-1/+1
| | |\ \
| | | * | Scaladoc js location synch more robustAdriaan Moors2015-02-201-1/+1
| | |/ /
| * | | 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 #4353 from xeno-by/topic/plugin-enter-statsAdriaan Moors2015-02-233-1/+81
|\ \ \
| * | | fixes pluginsEnterStatsEugene Burmako2015-02-223-1/+81
* | | | Merge pull request #4354 from Ichoran/issue/9172Adriaan Moors2015-02-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | SI-9172 FlatMapped views throw exception on filterRex Kerr2015-02-221-1/+1
|/ / /
* | | Merge pull request #4350 from adriaanm/scaladocAdriaan Moors2015-02-201-1/+1
|\ \ \
| * | | Scaladoc js location synch more robustAdriaan Moors2015-02-201-1/+1
|/ / /
* | | Merge pull request #4344 from Ichoran/issue/9126Adriaan Moors2015-02-204-22/+46
|\ \ \
| * | | SI-9126 Missing .seqs causes problems with parallel GenXsRex Kerr2015-02-204-22/+46
|/ / /
* | | Merge pull request #4347 from retronym/ticket/8801Adriaan Moors2015-02-191-0/+21
|\ \ \ | |/ / |/| |
| * | SI-8801 Another test for fixed exponential-time compilationJason Zaugg2015-02-201-0/+21
* | | 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
| | |_|_|/ / / | |/| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-04 00:14:37 +0000