summaryrefslogtreecommitdiff
path: root/test/files/pos
Commit message (Expand)AuthorAgeFilesLines
* SI-7427 stop crashing under -Ydebug.Paul Phillips2013-05-192-0/+5
* Merge 2.10.x into masterAdriaan Moors2013-05-171-0/+8
|\
| * SI-7486 regression in implicit resolution.Paul Phillips2013-05-171-0/+8
* | Merge pull request #2518 from paulp/issue/1786Adriaan Moors2013-05-172-0/+67
|\ \
| * | No bounds-driven inference for the named.Paul Phillips2013-05-141-6/+6
| * | SI-1786 incorporate defined bounds in inferencePaul Phillips2013-05-122-0/+67
* | | Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-masterJason Zaugg2013-05-17159-389/+943
|\ \ \ | |_|/ |/| |
| * | Merge pull request #2374 from adriaanm/ticket-6815Jason Zaugg2013-05-172-0/+33
| |\ \
| | * | SI-6815 untangle isStable and hasVolatileTypeAdriaan Moors2013-05-162-0/+33
| * | | Merge pull request #2534 from retronym/ticket/3943Adriaan Moors2013-05-162-0/+21
| |\ \ \
| | * | | SI-3943 Test case for already-fixed Java interop bugJason Zaugg2013-05-152-0/+21
| | | |/ | | |/|
| * | | SI-7469 Remove @deprecated scala.util.loggingSimon Ochsenreither2013-05-161-4/+0
| | |/ | |/|
| * | macroExpandAll is now triggered in all invocations of typedEugene Burmako2013-05-122-0/+4
| |/
| * Merge 2.10.x into masterAdriaan Moors2013-05-027-0/+123
| |\
| * | SI-4365 nondeterministic failure in asSeenFromPaul Phillips2013-04-222-0/+40
| * | Merge remote-tracking branch 'origin/2.10.x' into merge/v2.10.1-245-g5147bb2-...Jason Zaugg2013-04-204-0/+32
| |\ \
| * \ \ Merge pull request #2336 from retronym/topic/deprecated-inheritance-tweakAdriaan Moors2013-04-154-0/+28
| |\ \ \
| | * | | SI-7315 Test @deprecatedInheritance / @specialized interplayJason Zaugg2013-03-302-0/+5
| | * | | SI-7312 @deprecatedInheritance now ignores same-file subclassesJason Zaugg2013-03-302-0/+23
| * | | | Merge remote-tracking branch 'origin/2.10.x' into merge/v2.10.1-235-g4525e92-...Jason Zaugg2013-04-152-0/+15
| |\ \ \ \
| * | | | | Transcendent rewrite of isSameType.Paul Phillips2013-04-051-19/+0
| * | | | | Merge remote tracking branch 'origin/2.10.x' into topic/merge-2.10.x-to-v2.11...Jason Zaugg2013-04-026-0/+155
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #2317 from retronym/ticket/7232-masterAdriaan Moors2013-04-0115-0/+70
| |\ \ \ \ \ \
| | * | | | | | SI-7232 Fix Java import vs defn. binding precendenceJason Zaugg2013-03-2615-0/+70
| * | | | | | | Merge pull request #2318 from retronym/ticket/7259-masterAdriaan Moors2013-04-014-0/+14
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | SI-7259 Fix detection of Java defined SelectsJason Zaugg2013-03-264-0/+14
| | |/ / / / /
| * | | | | | Merge pull request #2305 from retronym/ticket/7296-2Adriaan Moors2013-03-292-0/+9
| |\ \ \ \ \ \
| | * | | | | | SI-7296 Remove arity limit for case classesJason Zaugg2013-03-252-0/+9
| * | | | | | | Merge commit '395e90a786' into pr/merge-395e90a786Paul Phillips2013-03-282-0/+22
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | SI-7294 Treat TupleN as final under -XfutureJason Zaugg2013-03-241-0/+6
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #2259 from Blaisorblade/issue/6123-try-3Paul Phillips2013-03-224-0/+22
| |\ \ \ \ \ \
| | * | | | | | Add positive and negative testcases for SI-6123 (-explaintypes)Paolo G. Giarrusso2013-03-154-0/+22
| * | | | | | | SI-7247, deprecated NotNull.Paul Phillips2013-03-132-16/+0
| |/ / / / / /
| * | | | | | Merge pull request #2215 from paulp/issue/7228Paul Phillips2013-03-133-19/+76
| |\ \ \ \ \ \
| | * | | | | | Simplified the widening logic.Paul Phillips2013-03-102-19/+1
| | * | | | | | SI-7228, bug in weak subtyping.Paul Phillips2013-03-101-0/+75
| * | | | | | | Merge 2.10.x into masterAdriaan Moors2013-03-123-0/+61
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge 2.10.x into master.Adriaan Moors2013-03-052-0/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge 2.10.x into master.Adriaan Moors2013-03-051-0/+26
| |\ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| *---. \ \ \ \ \ \ \ \ Merge 2.10.x into master.Adriaan Moors2013-03-051-0/+11
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merge branch 2.10.1 into masterAdriaan Moors2013-02-271-0/+13
| |\| | | | | | | | | | |
| * | | | | | | | | | | | Merge 2.10.x into master.Adriaan Moors2013-02-205-0/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'scala/2.10.x' into patmat-refactor-masterAdriaan Moors2013-02-122-0/+31
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2057 from paulp/pr/revert-6355Paul Phillips2013-02-121-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | SI-6355, weakend implementation restriction on applyDynamic.Paul Phillips2013-02-121-0/+16
| * | | | | | | | | | | | | | Maintenance of Predef.Paul Phillips2013-02-1238-163/+163
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/2.10.x' into merge-210Paul Phillips2013-02-109-5/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \
| *---. \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'b43ae58f31'; commit 'b579a42ee3'; commit '81fa831609' into merg...Paul Phillips2013-02-101-47/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '558c059227' into merge-210Paul Phillips2013-02-092-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '81d8f9d3da' into merge-210Paul Phillips2013-02-092-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |