summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'cc6fea6' into merge/2.11.x-to-2.12.x-20160203Jason Zaugg2016-02-0423-136/+315
|\
| * Merge pull request #4927 from szeiger/issue/9572Jason Zaugg2016-02-015-35/+71
| |\
| | * SI-9572 Check for illegal tuple sizes in the parserStefan Zeiger2016-01-285-35/+71
| * | Merge pull request #4922 from SethTisue/fix-cla-linksJason Zaugg2016-02-012-2/+2
| |\ \
| | * | fix broken links to Scala CLASeth Tisue2016-01-272-2/+2
| * | | Merge pull request #4921 from szeiger/issue/9534Jason Zaugg2016-02-012-1/+14
| |\ \ \
| | * | | SI-9534 Use BoxedUnit in all cases for creating Array[Unit]Stefan Zeiger2016-01-272-1/+14
| | | |/ | | |/|
| * | | Merge pull request #4932 from SethTisue/readme-tweakSeth Tisue2016-01-291-1/+1
| |\ \ \
| | * | | tweak my own entry in the readmeSeth Tisue2016-01-291-1/+1
| |/ / /
| * | | Merge pull request #4884 from szeiger/wip/sbt-pr-validationSeth Tisue2016-01-297-68/+121
| |\ \ \ | | |/ / | |/| |
| | * | Use sbt for PR validation builds.Stefan Zeiger2016-01-127-68/+121
| * | | Merge pull request #4891 from janekdb/2.11.x-CommentFactoryBase-mix-1Lukas Rytz2016-01-263-18/+85
| |\ \ \
| | * | | Trim complexity in CommentFactoryBaseJanek Bogucki2016-01-253-18/+85
| | | |/ | | |/|
| * | | Merge pull request #4913 from szeiger/wip/sbt-windows-fixesLukas Rytz2016-01-263-12/+20
| |\ \ \
| | * | | Improved EOL handling for scripts generated by the sbt buildStefan Zeiger2016-01-251-9/+10
| | * | | Use portable Java APIs instead of calling chmod from sbtStefan Zeiger2016-01-251-3/+4
| | * | | Use Windows classpath in sh scripts when building in sbt on WindowsStefan Zeiger2016-01-211-4/+10
| | * | | Normalize Windows paths when calling JarJar from the sbt buildStefan Zeiger2016-01-141-2/+2
| * | | | Merge pull request #4918 from raboof/patch-1Lukas Rytz2016-01-251-0/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Link 'Future' scaladoc to 'Futures and Promises'Arnout Engelen2016-01-251-0/+2
| |/ / /
| * | | Merge pull request #4899 from som-snytt/issue/9616Jason Zaugg2016-01-194-24/+96
| |\ \ \
* | \ \ \ Merge commit '8c50d84' into merge/2.11.x-to-2.12.x-20160203Jason Zaugg2016-02-030-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [backport] SI-9616 False positive in unused import warningSom Snytt2016-01-074-24/+96
* | | | | Merge commit 'bf599bc' into merge/2.11.x-to-2.12.x-20160203Jason Zaugg2016-02-0331-60/+365
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4905 from SethTisue/disable-flaky-prezzy-test-on-windowsJason Zaugg2016-01-181-0/+6
| |\ \ \ \
| | * | | | disable flaky presentation compiler test on WindowsSeth Tisue2016-01-151-0/+6
| | | |/ / | | |/| |
| * | | | Merge pull request #4910 from grimreaper/eax/spelling/earlytheJason Zaugg2016-01-1810-13/+13
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix some simple extra wordsEitan Adler2016-01-1710-13/+13
| |/ / /
| * | | Merge pull request #4886 from janekdb/2.11.x-scaladoc-Duration-linksSeth Tisue2016-01-141-2/+2
| |\ \ \
| | * | | Fix Scaladoc overloaded method link to Duration companion objectJanek Bogucki2016-01-041-2/+2
| | |/ /
| * | | Merge pull request #4902 from ruippeixotog/issue/9605Seth Tisue2016-01-132-6/+54
| |\ \ \
| | * | | SI-9605 Searching does not use binary search for ArrayRui Gonçalves2016-01-122-6/+54
| | |/ /
| * | | Merge pull request #4892 from linasm/si-8641-2.11Seth Tisue2016-01-135-20/+20
| |\ \ \ | | |/ / | |/| |
| | * | SI-8641 Fix right shift docs for integer typesLinas Medziunas2016-01-035-20/+20
| |/ /
| * | Merge pull request #4765 from janekdb/2.11.x-scaladoc-diffSeth Tisue2015-12-181-0/+117
| |\ \
| | * | Enhance scaladoc-diff tool for Ubuntu.Janek Bogucki2015-10-031-27/+73
| | * | Script to compare the current scaladoc with the parent commit's docJanek Bogucki2015-09-301-0/+71
| * | | Merge pull request #4862 from retronym/ticket/9567Lukas Rytz2015-12-185-4/+82
| |\ \ \
| | * | | SI-9567 Fix pattern match on 23+ param, method local case classJason Zaugg2015-11-253-1/+38
| | * | | SI-9567 Fix latent bugs in patmat's reasoning about mutabilityJason Zaugg2015-11-252-3/+44
| * | | | Merge pull request #4882 from janekdb/2.11.x-scaladoc-tables-1Lukas Rytz2015-12-182-6/+11
| |\ \ \ \
| | * | | | Document JavaConverters conversion from java.util.Properties to MapJanek Bogucki2015-12-122-6/+11
| * | | | | Merge pull request #4831 from martijnhoekstra/patch-4Seth Tisue2015-12-171-0/+12
| |\ \ \ \ \
| | * | | | | change phrasing around eulers number for `log(x)`martijnhoekstra2015-12-111-3/+1
| | * | | | | add doc for log, sqrtmartijnhoekstra2015-10-301-0/+14
| * | | | | | Merge pull request #4883 from janekdb/2.11-x-scaladoc-ui-capitalizationSeth Tisue2015-12-161-2/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Apply title case to Scaladoc buttons: By Inheritance & Show AllJanek Bogucki2015-12-151-2/+2
| |/ / / / /
| * | | | | Merge pull request #4876 from ruippeixotog/issue/9581Seth Tisue2015-12-152-2/+32
| |\ \ \ \ \
| | * | | | | SI-9581 Fix overflow on Vector take and drop methodsRui Gonçalves2015-12-062-2/+32
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #4881 from szeiger/wip/sbt-partestSeth Tisue2015-12-134-11/+20
| |\ \ \ \ \ | | |/ / / / | |/| | | |