summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '767cc44' into merge/2.11.x-to-2.12.x-20150129Jason Zaugg2015-01-290-0/+0
|\
| * Merge pull request #4048 from lrytz/t8899Grzegorz Kossakowski2014-10-206-139/+13
| |\
| | * [nomerge] SI-8899 Revert "SI-8627 make Stream.filterNot non-eager"Lukas Rytz2014-10-126-139/+13
* | | Merge commit 'eb15950' into merge/2.11.x-to-2.12.x-20150129Jason Zaugg2015-01-29130-435/+1273
|\| |
| * | Merge pull request #4053 from lrytz/tmp/t8907Grzegorz Kossakowski2014-10-203-24/+66
| |\ \ | | |/ | |/|
| | * SI-8907 Don't force symbol info in isModuleNotMethodLukas Rytz2014-10-153-24/+66
| |/
| * Merge pull request #4039 from roberthoedicke/2.11.xJason Zaugg2014-10-107-11/+11
| |\
| | * Update 04-basic-declarations-and-definitions.mdRobert Hoedicke2014-10-101-3/+3
| | * Update 12-the-scala-standard-library.mdroberthoedicke2014-10-091-1/+1
| | * Update 10-xml-expressions-and-patterns.mdroberthoedicke2014-10-091-1/+1
| | * Update 08-pattern-matching.mdroberthoedicke2014-10-081-2/+2
| | * Update 06-expressions.mdroberthoedicke2014-10-081-3/+3
| | * Update 04-basic-declarations-and-definitions.mdroberthoedicke2014-10-081-2/+2
| | * Update 03-types.mdroberthoedicke2014-10-081-1/+1
| | * Update 03-types.mdroberthoedicke2014-10-081-1/+1
| | * Update 02-identifiers-names-and-scopes.mdroberthoedicke2014-10-081-1/+1
| * | Merge pull request #4038 from adriaanm/t8894v2.11.3Grzegorz Kossakowski2014-10-093-2/+14
| |\ \
| | * | SI-8894 dealias when looking at tuple componentsAdriaan Moors2014-10-083-2/+14
| | |/
| * | Merge pull request #3993 from puffnfresh/feature/color-replGrzegorz Kossakowski2014-10-095-5/+49
| |\ \
| | * | Use color REPL after writing a defBrian McKenna2014-10-071-10/+19
| | * | Add color to severity in REPL reporterBrian McKenna2014-09-242-1/+19
| | * | Color REPL under -Dscala.colorBrian McKenna2014-09-213-2/+19
| * | | Merge pull request #4037 from adriaanm/t8890Grzegorz Kossakowski2014-10-093-16/+40
| |\ \ \ | | |_|/ | |/| |
| | * | SI-8890 handle reference to overload with errorAdriaan Moors2014-10-093-16/+40
| |/ /
| * | Merge pull request #4032 from dturner-tw/dturner/scaldoc-exit-codeGrzegorz Kossakowski2014-10-071-9/+11
| |\ \
| | * | Make Scaladoc actually exit with non-zero exit code in case of errors,David Turner2014-10-041-9/+11
| * | | Merge pull request #4026 from soc/SI-4788-newGrzegorz Kossakowski2014-10-0724-120/+238
| |\ \ \
| | * | | SI-4788/SI-5948 Respect RetentionPolicy of Java annotationsSimon Ochsenreither2014-10-0724-120/+238
| * | | | Merge pull request #4028 from soc/topic/serialversionuid-spamGrzegorz Kossakowski2014-10-071-1/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Avoid ClassfileAnnotation warning for @SerialVersionUIDSimon Ochsenreither2014-10-071-1/+4
| |/ / /
| * | | Merge pull request #4030 from som-snytt/issue/8843Grzegorz Kossakowski2014-10-076-53/+230
| |\ \ \
| | * | | SI-8843 AbsFileCL acts like a CLSom Snytt2014-10-066-53/+230
| * | | | Merge pull request #4034 from adriaanm/pr-3950-reworkGrzegorz Kossakowski2014-10-071-3/+9
| |\ \ \ \
| | * | | | Update stripPrefix/StringLike docs to talk about no op caseMax Bileschi2014-10-071-3/+9
| * | | | | Merge pull request #3986 from som-snytt/issue/6502-no-cpGrzegorz Kossakowski2014-10-075-71/+74
| |\ \ \ \ \
| | * | | | | SI-6502 Repl reset/replay take settings argsSom Snytt2014-09-225-70/+69
| | * | | | | SI-6502 Remove cp command as unworkableSom Snytt2014-09-211-1/+5
| * | | | | | Merge pull request #4016 from lrytz/t8731Grzegorz Kossakowski2014-10-0712-19/+93
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | SI-8731 warning if @switch is ignoredLukas Rytz2014-10-0612-19/+93
| * | | | | | Merge pull request #4033 from retronym/ticket/8888Lukas Rytz2014-10-073-1/+14
| |\ \ \ \ \ \
| | * | | | | | SI-8888 Avoid ClassFormatError under -Ydelambdafy:methodJason Zaugg2014-10-073-1/+14
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #3954 from gbasler/ticket/7746-2.11Grzegorz Kossakowski2014-10-0611-63/+129
| |\ \ \ \ \ \
| | * | | | | | Cleanup `LinkedHashSet` fixes and replace them with `Set` (i.e., backGerard Basler2014-10-052-22/+14
| | * | | | | | SI-7746 patmat: fix non-determinism, infeasible counter examplesGerard Basler2014-10-0511-41/+115
| * | | | | | | Merge pull request #4023 from retronym/topic/time-me-outGrzegorz Kossakowski2014-10-061-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Increase REPL startup timeout to avoid test failuresJason Zaugg2014-10-011-1/+1
| * | | | | | | | Merge pull request #4019 from Ichoran/issue/6192Lukas Rytz2014-10-061-1/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | SI-6192 Range: to, until and end are confusingRex Kerr2014-09-301-1/+7
| | |/ / / / / / /
| * | | | | | | | Merge pull request #4027 from dragos/doc/reinstate-testLukas Rytz2014-10-065-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Disable flaky presentation compiler test."Iulian Dragos2014-10-035-0/+0
| | | |_|_|_|_|/ / | | |/| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 19:49:55 +0000