summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'eb15950' into merge/2.11.x-to-2.12.x-20150129Jason Zaugg2015-01-2935-372/+564
|\
| * SI-8907 Don't force symbol info in isModuleNotMethodLukas Rytz2014-10-152-24/+27
| * Merge pull request #4038 from adriaanm/t8894v2.11.3Grzegorz Kossakowski2014-10-092-2/+2
| |\
| | * SI-8894 dealias when looking at tuple componentsAdriaan Moors2014-10-082-2/+2
| * | 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
| * | | SI-8890 handle reference to overload with errorAdriaan Moors2014-10-091-16/+25
| | |/ | |/|
| * | 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-076-120/+106
| |\ \ \
| | * | | SI-4788/SI-5948 Respect RetentionPolicy of Java annotationsSimon Ochsenreither2014-10-076-120/+106
| * | | | Avoid ClassfileAnnotation warning for @SerialVersionUIDSimon Ochsenreither2014-10-071-1/+4
| |/ / /
| * | | Merge pull request #4030 from som-snytt/issue/8843Grzegorz Kossakowski2014-10-073-50/+56
| |\ \ \
| | * | | SI-8843 AbsFileCL acts like a CLSom Snytt2014-10-063-50/+56
| * | | | 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-074-70/+73
| |\ \ \ \ \
| | * | | | | SI-6502 Repl reset/replay take settings argsSom Snytt2014-09-224-69/+68
| | * | | | | SI-6502 Remove cp command as unworkableSom Snytt2014-09-211-1/+5
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #4016 from lrytz/t8731Grzegorz Kossakowski2014-10-071-1/+17
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | SI-8731 warning if @switch is ignoredLukas Rytz2014-10-061-1/+17
| * | | | | Merge pull request #4033 from retronym/ticket/8888Lukas Rytz2014-10-071-1/+1
| |\ \ \ \ \
| | * | | | | SI-8888 Avoid ClassFormatError under -Ydelambdafy:methodJason Zaugg2014-10-071-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #3954 from gbasler/ticket/7746-2.11Grzegorz Kossakowski2014-10-064-53/+117
| |\ \ \ \ \
| | * | | | | 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-054-31/+103
| * | | | | | 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
| | |/ / / / / /
| * | | / / / / SI-8291 Fix implicitNotFound message with type aliasesJason Zaugg2014-10-051-1/+3
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #3995 from retronym/ticket/8267Grzegorz Kossakowski2014-10-041-5/+22
| |\ \ \ \ \ \
| | * | | | | | SI-8267 Avoid existentials after polymorphic overload resolutionJason Zaugg2014-10-021-5/+22
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #4024 from retronym/ticket/8217Grzegorz Kossakowski2014-10-041-0/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | SI-8217 allow abstract type members in objectsPaolo G. Giarrusso2014-10-011-0/+1
| * | | | | | Merge pull request #4021 from retronym/ticket/8869Jason Zaugg2014-10-021-0/+2
| |\ \ \ \ \ \
| | * | | | | | SI-8869 Prevent ill-kindedness in type lambdasJason Zaugg2014-10-011-0/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #4020 from Ichoran/issue/8624Jason Zaugg2014-10-011-0/+5
| |\ \ \ \ \ \
| | * | | | | | SI-8624 PriorityQueue documentation is not clear enoughRex Kerr2014-09-301-0/+5
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #4010 from lrytz/t8087Jason Zaugg2014-10-011-5/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | SI-8087 keep annotations on mixed-in private[this] fieldsLukas Rytz2014-09-301-5/+12
| * | | | | | Don't remove elements from a map during iteration.Jason Zaugg2014-09-301-2/+4
| | |/ / / / | |/| | | |
| * | | | | SI-8868 Fix unpickling of local dummy symbolsJason Zaugg2014-09-301-2/+10
* | | | | | Merge pull request #4098 from retronym/ticket/7128Jason Zaugg2015-01-274-7/+5
|\ \ \ \ \ \
| * | | | | | SI-7128 copyToArray(xs, 0, 0) should not failRex Kerr2015-01-084-7/+5
* | | | | | | Merge pull request #4197 from lrytz/t9030Jason Zaugg2015-01-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | SI-9030 make BoxesRunTime.equalsNumChar publicLukas Rytz2014-12-111-1/+1
* | | | | | | | Merge pull request #4155 from Ichoran/issue/8519Jason Zaugg2015-01-222-3/+38
|\ \ \ \ \ \ \ \