summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #5010 from janekdb/2.12.x-deprecate-expand-all-typesVlad Ureche2016-03-061-1/+5
|\ \ \ \ \ \
| * | | | | | SI-6886: Deprecate -expand-all-typesJanek Bogucki2016-03-041-1/+5
|/ / / / / /
* | | | | | Merge pull request #5007 from SethTisue/scala-dev-issue-89Seth Tisue2016-03-041-14/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix bootstrap regression (module docs weren't being published)Seth Tisue2016-03-031-14/+5
|/ / / / /
* | | | | Merge pull request #5004 from felixmulder/topic/scaladoc-fix-content-diagramsVlad Ureche2016-03-023-10/+14
|\ \ \ \ \
| * | | | | Fix diagrams for `Content Hierarchies` in scaladocFelix Mulder2016-03-023-10/+14
|/ / / / /
* | | | | Merge pull request #4934 from Shadow53/2.12.xSeth Tisue2016-03-011-0/+2
|\ \ \ \ \
| * | | | | Added Properties.isLinux to compliment the isWin and isMac methodsShadow532016-01-301-0/+2
* | | | | | Merge pull request #4997 from felixmulder/topic/scaladoc-unclutterVlad Ureche2016-03-018-148/+158
|\ \ \ \ \ \
| * | | | | | Unclutter scaladoc entity membersFelix Mulder2016-03-018-148/+158
|/ / / / / /
* | | | | | Merge pull request #4983 from felixmulder/topic/scaladoc-package-viewVlad Ureche2016-02-266-16/+221
|\ \ \ \ \ \
| * | | | | | Add package view to scaladocFelix Mulder2016-02-266-16/+221
|/ / / / / /
* | | | | | Merge pull request #4996 from retronym/merge/2.11.x-to-2.12.x-20160225Seth Tisue2016-02-2548-96/+120
|\ \ \ \ \ \
| * | | | | | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2016...Jason Zaugg2016-02-2548-96/+120
|/| | | | | | | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #4995 from SethTisue/typesafe-is-now-lightbendSeth Tisue2016-02-2414-25/+25
| |\ \ \ \ \
| | * | | | | Typesafe is now LightbendSeth Tisue2016-02-2414-25/+25
| * | | | | | Merge pull request #4975 from szeiger/wip/backport-partest-0.13-to-2.11.xSeth Tisue2016-02-239-20/+17
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Update to partest 1.0.13Jason Zaugg2016-02-173-18/+3
| | * | | | | Update partest to 1.0.12, test case for reporting invalid flagsLukas Rytz2016-02-177-3/+15
| * | | | | | Merge pull request #4992 from joeratt/issue/9664Seth Tisue2016-02-221-2/+2
| |\ \ \ \ \ \
| | * | | | | | [SI-9664] - Updating README.md's IntelliJ version reference.JoeRatt2016-02-221-2/+2
| * | | | | | | Merge pull request #4986 from janekdb/2.11.x-remove-GNU-Java-man-pages-helpSeth Tisue2016-02-223-15/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Remove GIJ memory configuration advice from fsc, scala and scalac man pages.Janek Bogucki2016-02-203-15/+3
| |/ / / / / /
| * | | | | | Merge pull request #4981 from retronym/topic/version-override-sbtStefan Zeiger2016-02-191-1/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | [sbt] Allow system properties to override entries in verions.propsJason Zaugg2016-02-191-1/+3
| |/ / / / /
| * | | | | Merge pull request #4967 from lrytz/smhasherUrlSeth Tisue2016-02-152-2/+2
| |\ \ \ \ \
| | * | | | | fix smhasher urlxuwei-k2016-02-152-2/+2
| |/ / / / /
| * | | | | Merge pull request #4960 from janekdb/2.11.x-Scaladoc-ProductN-off-by-oneLukas Rytz2016-02-1523-24/+23
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix off-by-one documentation error in Product<N>Janek Bogucki2016-02-1123-24/+23
| * | | | | Merge pull request #4956 from retronym/topic/sbt-tweaks-4Seth Tisue2016-02-113-18/+17
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #4954 from retronym/topic/fullnameLukas Rytz2016-02-101-13/+25
| |\ \ \ \ \
| | * | | | | Micro optimise Symbol#fullNameJason Zaugg2016-02-091-13/+25
| * | | | | | Merge pull request #4939 from szeiger/issue/9624Lukas Rytz2016-02-103-15/+25
| |\ \ \ \ \ \
| | * | | | | | SI-9624 Improve documentation for TraversableOnceStefan Zeiger2016-02-043-15/+25
| * | | | | | | Merge pull request #4928 from szeiger/wip/document-e-ncLukas Rytz2016-02-102-1/+14
| |\ \ \ \ \ \ \
| | * | | | | | | Document when the `scala` command starts/uses a compilation daemonStefan Zeiger2016-02-012-1/+14
* | | | | | | | | Merge pull request #4968 from lrytz/oldOptCleanupAdriaan Moors2016-02-2470-260/+149
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove -Y settings that are no longer used in 2.12Lukas Rytz2016-02-1656-216/+91
| * | | | | | | | | Rewrite a few more tests to the new optimizerLukas Rytz2016-02-1515-44/+58
* | | | | | | | | | Merge pull request #4958 from adriaanm/typerefrefactorAdriaan Moors2016-02-245-182/+189
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | thisInfo.parents also needs separate treatmentAdriaan Moors2016-02-121-1/+5
| * | | | | | | | | | Less distribution of logic across TypeRef subclassesAdriaan Moors2016-02-122-108/+128
| * | | | | | | | | | SI-9540 typedFunction is erasure awareAdriaan Moors2016-02-123-7/+13
| * | | | | | | | | | Towards understanding `TypeRef`'s `transformInfo`/`baseType`Adriaan Moors2016-02-101-94/+71
* | | | | | | | | | | Merge pull request #4989 from retronym/ticket/SD-88Seth Tisue2016-02-221-2/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix boostrap script when STARR isn't customizedJason Zaugg2016-02-221-2/+0
* | | | | | | | | | | | Merge pull request #4991 from felixmulder/topic/scaladoc-shortDescription-ann...Vlad Ureche2016-02-225-6/+71
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add doc annotation `@shortDescription` to enable explicit synopsisFelix Mulder2016-02-225-6/+71
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #4979 from felixmulder/topic/scaladoc-search-progressVlad Ureche2016-02-184-42/+57
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add progress bar for searchFelix Mulder2016-02-184-42/+57
|/ / / / / / / / / / /