summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4914 from felixmulder/topic/scaladoc-update-diagramsVlad Ureche2016-01-2319-5681/+89
|\
| * Add partial appearance update of inheritence graphs in scaladocFelix Mulder2016-01-2319-5681/+89
|/
* Merge pull request #4911 from lrytz/showRawFootnotesSeth Tisue2016-01-205-38/+36
|\
| * SD-70 Don't share footnotes across multiple calls to universe.showRawLukas Rytz2016-01-195-38/+36
|/
* Merge pull request #4870 from ruippeixotog/issue/9507Jason Zaugg2016-01-191-3/+4
|\
| * SI-9507 Make ArrayStack an IndexedSeqOptimizedRui Gonçalves2015-11-271-3/+4
* | Merge pull request #4903 from som-snytt/issue/9622Jason Zaugg2016-01-182-9/+14
|\ \
| * | SI-9622 Native method may be privateSom Snytt2016-01-132-9/+14
* | | Merge pull request #4898 from soc/SI-8700Lukas Rytz2016-01-1414-13/+82
|\ \ \
| * | | SI-8700 Exhaustiveness warning for enums from Java sourceSimon Ochsenreither2016-01-1414-13/+82
* | | | Merge pull request #4900 from mpociecha/correct-decimal-marks-in-tests2Seth Tisue2016-01-131-16/+36
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix problems with a locale-dependent decimal mark in StringContextTestMichał Pociecha2016-01-131-16/+36
|/ / /
* | | Merge pull request #4897 from linasm/stringContextTest-windowsSeth Tisue2016-01-131-3/+2
|\ \ \ | |/ / |/| |
| * | Make StringContextTest pass on WindowsLinas Medziunas2016-01-131-3/+2
|/ /
* | Merge pull request #4888 from felixmulder/topic/scaladoc-relative-fontsVlad Ureche2016-01-055-86/+270
|\ \
| * | add mobile CSS rules for updated scaladoc lookFelix Mulder2016-01-045-86/+270
|/ /
* | Merge pull request #4889 from kzys/jira-8289Lukas Rytz2016-01-042-6/+10
|\ \
| * | SI-8289 Scaladoc: Make the order of subclasses deterministicKato Kazuyoshi2015-12-312-6/+10
|/ /
* | Merge pull request #4877 from felixmulder/topic/scaladoc-updated-lookVlad Ureche2015-12-2275-538/+1321
|\ \
| * | add new look to scaladocFelix Mulder2015-12-2275-538/+1321
|/ /
* | Merge pull request #4872 from szeiger/wip/sbt-osgi-2.12Lukas Rytz2015-12-184-95/+384
|\ \
| * | Create a full Scala distribution from sbtStefan Zeiger2015-11-273-103/+317
| * | Some small fixes for generated artifacts in the sbt buildStefan Zeiger2015-11-271-3/+22
| * | Build man pages and scala-dist.jar from sbtStefan Zeiger2015-11-262-0/+56
| |/
* | Merge pull request #4875 from slothspot/ticket/9454Lukas Rytz2015-12-183-9/+15
|\ \
| * | [SI-9454] Add isAlive method into sys.process.Process traitDmitry Melnichenko2015-12-113-9/+15
* | | Merge pull request #4885 from lrytz/pr4816-rebaseLukas Rytz2015-12-18203-590/+389
|\ \ \
| * | | Remove unused imports and other minor cleanupsSimon Ochsenreither2015-12-18203-590/+389
|/ / /
* | | Merge pull request #4729 from retronym/topic-trait-defaults-moduleLukas Rytz2015-12-1815-73/+143
|\ \ \
| * | | Avoid tree sharing in lazy val translationJason Zaugg2015-11-232-7/+5
| * | | Desugar module var and accessor in refchecks/lazyvalsJason Zaugg2015-10-0815-69/+141
* | | | Merge pull request #4265 from retronym/ticket/9110Lukas Rytz2015-12-182-1/+29
|\ \ \ \
| * | | | SI-9110 Pattern `O.C` must check `$outer eq O` for a top level OJason Zaugg2015-11-262-1/+29
| | |_|/ | |/| |
* | | | Merge pull request #4879 from ShaneDelmore/SI-9583Seth Tisue2015-12-112-1/+28
|\ \ \ \ | |_|_|/ |/| | |
| * | | SI-9583: Update SystemProperties.empty to return a mutable.Map to fix buildersShane Delmore2015-12-102-1/+28
|/ / /
* | | Merge pull request #4865 from SethTisue/intellij-readme-improvementsLukas Rytz2015-12-101-7/+14
|\ \ \
| * | | IntelliJ README improvementsSeth Tisue2015-11-251-7/+14
| |/ /
* | | Merge pull request #4874 from szeiger/wip/upgrade-jarjarLukas Rytz2015-11-271-2/+2
|\ \ \
| * | | Upgrade JarJar in the ant buildStefan Zeiger2015-11-271-2/+2
| |/ /
* | | Merge pull request #4873 from lrytz/merge-2.11-to-2.12-nov-27Lukas Rytz2015-11-2713-31/+40
|\ \ \
| * \ \ Merge commit '5e99f82' into merge-2.11-to-2.12-nov-27Lukas Rytz2015-11-2712-28/+28
| |\ \ \
| | * \ \ Merge pull request #4869 from janekdb/2.11.x-intellij-code-inspectionsLukas Rytz2015-11-2714-31/+31
| | |\ \ \
| | | * | | Apply some static code analysis recommendationsJanek Bogucki2015-11-2614-31/+31
| | |/ / /
| * | | | Merge commit '2890f0b' into merge-2.11-to-2.12-nov-27Lukas Rytz2015-11-270-0/+0
| |\| | |
| | * | | Merge pull request #4855 from szeiger/wip/sbt-osgiLukas Rytz2015-11-245-102/+413
| | |\ \ \
| | | * | | [nomerge] Create a full Scala distribution from sbtStefan Zeiger2015-11-243-107/+334
| | | * | | [nomerge] Some small fixes for generated artifacts in the sbt buildStefan Zeiger2015-11-241-3/+22
| * | | | | Merge commit '62f346b' into merge-2.11-to-2.12-nov-27Lukas Rytz2015-11-271-3/+12
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix JarJar “Keep” processing in sbt buildStefan Zeiger2015-11-241-3/+12
| * | | | | Merge commit '03607b2' into merge-2.11-to-2.12-nov-27Lukas Rytz2015-11-270-0/+0
|/| | | | | | |/ / / /