Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'eb15950' into merge/2.11.x-to-2.12.x-20150129 | Jason Zaugg | 2015-01-29 | 130 | -435/+1273 |
|\ | |||||
| * | Merge pull request #4053 from lrytz/tmp/t8907 | Grzegorz Kossakowski | 2014-10-20 | 3 | -24/+66 |
| |\ | |||||
| | * | SI-8907 Don't force symbol info in isModuleNotMethod | Lukas Rytz | 2014-10-15 | 3 | -24/+66 |
| |/ | |||||
| * | Merge pull request #4039 from roberthoedicke/2.11.x | Jason Zaugg | 2014-10-10 | 7 | -11/+11 |
| |\ | |||||
| | * | Update 04-basic-declarations-and-definitions.md | Robert Hoedicke | 2014-10-10 | 1 | -3/+3 |
| | * | Update 12-the-scala-standard-library.md | roberthoedicke | 2014-10-09 | 1 | -1/+1 |
| | * | Update 10-xml-expressions-and-patterns.md | roberthoedicke | 2014-10-09 | 1 | -1/+1 |
| | * | Update 08-pattern-matching.md | roberthoedicke | 2014-10-08 | 1 | -2/+2 |
| | * | Update 06-expressions.md | roberthoedicke | 2014-10-08 | 1 | -3/+3 |
| | * | Update 04-basic-declarations-and-definitions.md | roberthoedicke | 2014-10-08 | 1 | -2/+2 |
| | * | Update 03-types.md | roberthoedicke | 2014-10-08 | 1 | -1/+1 |
| | * | Update 03-types.md | roberthoedicke | 2014-10-08 | 1 | -1/+1 |
| | * | Update 02-identifiers-names-and-scopes.md | roberthoedicke | 2014-10-08 | 1 | -1/+1 |
| * | | Merge pull request #4038 from adriaanm/t8894v2.11.3 | Grzegorz Kossakowski | 2014-10-09 | 3 | -2/+14 |
| |\ \ | |||||
| | * | | SI-8894 dealias when looking at tuple components | Adriaan Moors | 2014-10-08 | 3 | -2/+14 |
| | |/ | |||||
| * | | Merge pull request #3993 from puffnfresh/feature/color-repl | Grzegorz Kossakowski | 2014-10-09 | 5 | -5/+49 |
| |\ \ | |||||
| | * | | Use color REPL after writing a def | Brian McKenna | 2014-10-07 | 1 | -10/+19 |
| | * | | Add color to severity in REPL reporter | Brian McKenna | 2014-09-24 | 2 | -1/+19 |
| | * | | Color REPL under -Dscala.color | Brian McKenna | 2014-09-21 | 3 | -2/+19 |
| * | | | Merge pull request #4037 from adriaanm/t8890 | Grzegorz Kossakowski | 2014-10-09 | 3 | -16/+40 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | SI-8890 handle reference to overload with error | Adriaan Moors | 2014-10-09 | 3 | -16/+40 |
| |/ / | |||||
| * | | Merge pull request #4032 from dturner-tw/dturner/scaldoc-exit-code | Grzegorz Kossakowski | 2014-10-07 | 1 | -9/+11 |
| |\ \ | |||||
| | * | | Make Scaladoc actually exit with non-zero exit code in case of errors, | David Turner | 2014-10-04 | 1 | -9/+11 |
| * | | | Merge pull request #4026 from soc/SI-4788-new | Grzegorz Kossakowski | 2014-10-07 | 24 | -120/+238 |
| |\ \ \ | |||||
| | * | | | SI-4788/SI-5948 Respect RetentionPolicy of Java annotations | Simon Ochsenreither | 2014-10-07 | 24 | -120/+238 |
| * | | | | Merge pull request #4028 from soc/topic/serialversionuid-spam | Grzegorz Kossakowski | 2014-10-07 | 1 | -1/+4 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Avoid ClassfileAnnotation warning for @SerialVersionUID | Simon Ochsenreither | 2014-10-07 | 1 | -1/+4 |
| |/ / / | |||||
| * | | | Merge pull request #4030 from som-snytt/issue/8843 | Grzegorz Kossakowski | 2014-10-07 | 6 | -53/+230 |
| |\ \ \ | |||||
| | * | | | SI-8843 AbsFileCL acts like a CL | Som Snytt | 2014-10-06 | 6 | -53/+230 |
| * | | | | Merge pull request #4034 from adriaanm/pr-3950-rework | Grzegorz Kossakowski | 2014-10-07 | 1 | -3/+9 |
| |\ \ \ \ | |||||
| | * | | | | Update stripPrefix/StringLike docs to talk about no op case | Max Bileschi | 2014-10-07 | 1 | -3/+9 |
| * | | | | | Merge pull request #3986 from som-snytt/issue/6502-no-cp | Grzegorz Kossakowski | 2014-10-07 | 5 | -71/+74 |
| |\ \ \ \ \ | |||||
| | * | | | | | SI-6502 Repl reset/replay take settings args | Som Snytt | 2014-09-22 | 5 | -70/+69 |
| | * | | | | | SI-6502 Remove cp command as unworkable | Som Snytt | 2014-09-21 | 1 | -1/+5 |
| * | | | | | | Merge pull request #4016 from lrytz/t8731 | Grzegorz Kossakowski | 2014-10-07 | 12 | -19/+93 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | SI-8731 warning if @switch is ignored | Lukas Rytz | 2014-10-06 | 12 | -19/+93 |
| * | | | | | | Merge pull request #4033 from retronym/ticket/8888 | Lukas Rytz | 2014-10-07 | 3 | -1/+14 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | SI-8888 Avoid ClassFormatError under -Ydelambdafy:method | Jason Zaugg | 2014-10-07 | 3 | -1/+14 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #3954 from gbasler/ticket/7746-2.11 | Grzegorz Kossakowski | 2014-10-06 | 11 | -63/+129 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Cleanup `LinkedHashSet` fixes and replace them with `Set` (i.e., back | Gerard Basler | 2014-10-05 | 2 | -22/+14 |
| | * | | | | | | SI-7746 patmat: fix non-determinism, infeasible counter examples | Gerard Basler | 2014-10-05 | 11 | -41/+115 |
| * | | | | | | | Merge pull request #4023 from retronym/topic/time-me-out | Grzegorz Kossakowski | 2014-10-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Increase REPL startup timeout to avoid test failures | Jason Zaugg | 2014-10-01 | 1 | -1/+1 |
| * | | | | | | | | Merge pull request #4019 from Ichoran/issue/6192 | Lukas Rytz | 2014-10-06 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | SI-6192 Range: to, until and end are confusing | Rex Kerr | 2014-09-30 | 1 | -1/+7 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #4027 from dragos/doc/reinstate-test | Lukas Rytz | 2014-10-06 | 5 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Revert "Disable flaky presentation compiler test." | Iulian Dragos | 2014-10-03 | 5 | -0/+0 |
| | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #4029 from retronym/ticket/8291 | Lukas Rytz | 2014-10-06 | 3 | -1/+17 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | SI-8291 Fix implicitNotFound message with type aliases | Jason Zaugg | 2014-10-05 | 3 | -1/+17 |
| | | |_|_|/ / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #3982 from retronym/ticket/8845 | Lukas Rytz | 2014-10-06 | 2 | -0/+18 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | |