summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4693 from scala/revert-3791-ticket/8346Seth Tisue2015-08-205-64/+6
|\
| * Revert "SI-8346 Rebuild invariant sets in #toSet, avoiding CCE"Adriaan Moors2015-08-185-64/+6
* | Merge pull request #4697 from martijnhoekstra/patch-3Seth Tisue2015-08-191-2/+2
|\ \
| * | Fix documentation of filter introduced in 13f30cmartijnhoekstra2015-08-191-2/+2
| |/
* | Merge pull request #4695 from janekdb/2.11.x-scaladoc-PredefSeth Tisue2015-08-191-1/+1
|\ \ | |/ |/|
| * Fix method name reference in Predef documentationJanek Bogucki2015-08-191-1/+1
|/
* Merge pull request #4678 from stusmall/2.11.xLukas Rytz2015-08-101-0/+4
|\
| * SI-3623 Improved error message for "filename too long" build errorsstusmall2015-08-071-0/+4
* | Merge pull request #4688 from retronym/topic/typer-debug-implicitsLukas Rytz2015-08-102-3/+5
|\ \
| * | Fix tracing of implicit search under -Ytyper-debugJason Zaugg2015-08-062-3/+5
* | | Merge pull request #4620 from lastland/patch-1Seth Tisue2015-08-071-1/+2
|\ \ \
| * | | Wait until the cat process is finished.Li Yao2015-08-071-1/+2
| * | | Fix the bug in the example in scala.sys.processLi Yao2015-07-111-1/+1
* | | | Merge pull request #4443 from adriaanm/abstractpromise-avoid-unsafeSeth Tisue2015-08-063-30/+25
|\ \ \ \
| * | | | SI-8362: AbstractPromise extends AtomicReferenceMariot Chauvin2015-07-293-30/+25
| | |_|/ | |/| |
* | | | Merge pull request #4554 from som-snytt/issue/1931Seth Tisue2015-08-0624-84/+139
|\ \ \ \
| * | | | SI-1931 Hide Predef.any2stringadd in REPLSom Snytt2015-07-0624-84/+139
| | |/ / | |/| |
* | | | Merge pull request #4672 from janekdb/2.11.x-scaladoc-compilerSeth Tisue2015-08-0610-21/+21
|\ \ \ \
| * | | | ScalaDoc fixes for compilerJanek Bogucki2015-07-2910-21/+21
| | |/ / | |/| |
* | | | Merge pull request #4675 from retronym/ticket/9425Seth Tisue2015-08-062-1/+10
|\ \ \ \
| * | | | SI-9425 Leave Companion.apply if constructor is less accessibleJason Zaugg2015-07-312-1/+10
* | | | | Merge pull request #4684 from janekdb/2.11.x-unit-return-in-mapSeth Tisue2015-08-061-1/+1
|\ \ \ \ \
| * | | | | Stop mapping to Unit when executing finally code.Janek Bogucki2015-08-051-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4685 from janekdb/2.11.x-length-not-sizeSeth Tisue2015-08-061-2/+2
|\ \ \ \ \
| * | | | | Avoid unnecessary implicit view on StringJanek Bogucki2015-08-051-2/+2
| |/ / / /
* | | | | Merge pull request #4682 from adriaanm/jline-quick.binSeth Tisue2015-08-051-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Include jline on quick.bin tool pathAdriaan Moors2015-08-041-1/+1
| | |/ / | |/| |
* | | | Merge pull request #4680 from janekdb/2.11.x-optionJason Zaugg2015-08-054-41/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Delegate null test to OptionJanek Bogucki2015-08-044-41/+11
|/ / /
* | | Merge pull request #4670 from retronym/ticket/9422Lukas Rytz2015-07-292-3/+16
|\ \ \ | |/ / |/| |
| * | SI-9422 Fix incorrect constant propagationJason Zaugg2015-07-292-3/+16
* | | Merge pull request #4669 from janekdb/2.11.x-scaladoc-reflectJason Zaugg2015-07-298-13/+12
|\ \ \
| * | | ScalaDoc fixes for reflectJanek Bogucki2015-07-288-13/+12
* | | | Merge pull request #4667 from janekdb/2.11.x-scaladoc-library-library-auxJason Zaugg2015-07-298-11/+11
|\ \ \ \ | |/ / / |/| | |
| * | | ScalaDoc fixes for library and library-auxJanek Bogucki2015-07-288-11/+11
* | | | Merge pull request #4665 from lrytz/asm-504-3Lukas Rytz2015-07-281-1/+1
|\ \ \ \
| * | | | Upgrade scala-asm to 5.0.4-scala-3Lukas Rytz2015-07-281-1/+1
|/ / / /
* | | | Merge pull request #4661 from retronym/ticket/9365Lukas Rytz2015-07-284-1/+69
|\ \ \ \
| * | | | SI-9365 Don't null out dependencies of transient lazy valsJason Zaugg2015-07-274-1/+69
| | |/ / | |/| |
* | | | Merge pull request #4662 from janekdb/2.11.x-redundant-val-modifierLukas Rytz2015-07-281-2/+2
|\ \ \ \
| * | | | Remove redundant 'val' from case class params.Janek Bogucki2015-07-271-2/+2
* | | | | Merge pull request #4664 from SethTisue/remove-dead-link-in-readmeLukas Rytz2015-07-281-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix readme for death of typesafe.artifactoryonline.comSeth Tisue2015-07-271-1/+1
| |/ / /
* | | | Merge pull request #4636 from SethTisue/contributor-stuff-from-github-wikiSeth Tisue2015-07-272-17/+94
|\ \ \ \ | |/ / / |/| | |
| * | | merge two reviewers lists in readmeSeth Tisue2015-07-271-23/+9
| * | | tighten up CONTRIBUTING.md a littleSeth Tisue2015-07-161-5/+3
| * | | readme/contributor's guide tweaksSeth Tisue2015-07-162-16/+5
| * | | tiny readme fixSeth Tisue2015-07-151-1/+1
| * | | merge in text from pull request policy from old wikiSeth Tisue2015-07-152-76/+114
| * | | drop in pull request policy from old wikiSeth Tisue2015-07-131-0/+65