Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3204 from retronym/topic/patmat-classtag-compound | Adriaan Moors | 2013-12-13 | 3 | -0/+24 |
|\ | |||||
| * | Test case for recently improved unchecked warning | Jason Zaugg | 2013-12-12 | 3 | -0/+24 |
* | | Merge pull request #3214 from retronym/ticket/8024 | Adriaan Moors | 2013-12-13 | 6 | -5/+52 |
|\ \ | |||||
| * | | SI-8024 Improve user-level toString of package objects | Jason Zaugg | 2013-12-12 | 2 | -5/+9 |
| * | | SI-8024 Fix inaccurate message on overloaded ambiguous ident | Jason Zaugg | 2013-12-12 | 5 | -6/+29 |
| * | | SI-8024 Pending test case for package object / overloading bug | Jason Zaugg | 2013-12-12 | 2 | -0/+20 |
| |/ | |||||
* | | Merge pull request #3263 from retronym/ticket/6780 | Adriaan Moors | 2013-12-13 | 3 | -28/+67 |
|\ \ | |||||
| * | | SI-6780 Refactor Context#implicitss | Jason Zaugg | 2013-12-11 | 1 | -30/+33 |
| * | | SI-6780 Better handling of cycles in in-scope implicit search | Jason Zaugg | 2013-12-11 | 3 | -9/+45 |
* | | | Merge pull request #3265 from retronym/merge/2.10.x-to-master | Adriaan Moors | 2013-12-13 | 124 | -6211/+562 |
|\ \ \ | |||||
| * \ \ | Merge commit '9cdbe28' into merge/2.10.x-to-master | Jason Zaugg | 2013-12-11 | 113 | -6150/+344 |
| |\ \ \ | |||||
| | * | | | Fixup #3248 missed a spot in pack.xml | Adriaan Moors | 2013-12-10 | 1 | -1/+1 |
| | * | | | Merge pull request #3249 from retronym/ticket/7912 | Adriaan Moors | 2013-12-10 | 2 | -2/+24 |
| | |\ \ \ | |||||
| | | * | | | SI-7912 Be defensive calling `toString` in `MatchError#getMessage` | Jason Zaugg | 2013-12-10 | 2 | -2/+24 |
| | * | | | | Merge pull request #3251 from retronym/ticket/8060 | Adriaan Moors | 2013-12-10 | 2 | -1/+12 |
| | |\ \ \ \ | |||||
| | | * | | | | SI-8060 Avoid infinite loop with higher kinded type alias | Jason Zaugg | 2013-12-10 | 2 | -1/+12 |
| | | |/ / / | |||||
| | * | | | | Merge pull request #3248 from adriaanm/dist-cleanup-licenses | Adriaan Moors | 2013-12-10 | 113 | -6236/+303 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Update README, include doc/licenses in distro | Adriaan Moors | 2013-12-10 | 7 | -66/+301 |
| | | * | | | Add attribution for Typesafe. | Adriaan Moors | 2013-12-09 | 1 | -0/+2 |
| | | * | | | Remove docs/examples; they reside at scala/scala-dist | Adriaan Moors | 2013-12-09 | 104 | -6120/+1 |
| | | * | | | Remove unused android test and corresponding license. | Adriaan Moors | 2013-12-09 | 3 | -43/+0 |
| | | * | | | Do not distribute partest and its dependencies. | Adriaan Moors | 2013-12-09 | 1 | -8/+0 |
| * | | | | | Merge commit '0c92704' into merge/2.10.x-to-master | Jason Zaugg | 2013-12-11 | 9 | -61/+183 |
| |\| | | | | |||||
| | * | | | | Merge pull request #3222 from skyluc/issue/completion-import-vals-210-7995 | Adriaan Moors | 2013-12-09 | 6 | -54/+112 |
| | |\ \ \ \ | |||||
| | | * | | | | SI-7995 completion imported vars and vals | Luc Bourlier | 2013-12-06 | 6 | -54/+112 |
| | * | | | | | Merge pull request #3244 from rtyley/si-8019-swing-publisher-check-pf-defined | Adriaan Moors | 2013-12-09 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | SI-8019 Make Publisher check PartialFunction is defined for Event | Roberto Tyley | 2013-12-09 | 1 | -1/+1 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #3229 from retronym/ticket/8029 | Adriaan Moors | 2013-12-09 | 3 | -1/+69 |
| | |\ \ \ \ | |||||
| | | * | | | | SI-8029 Avoid multi-run cyclic error with companions, package object | Jason Zaugg | 2013-12-06 | 3 | -1/+69 |
| | | |/ / / | |||||
| * | | | | | Merge commit '4d439dd' into merge/2.10.x-to-master | Jason Zaugg | 2013-12-11 | 0 | -0/+0 |
| |\| | | | | |||||
| | * | | | | Merge pull request #3230 from retronym/backport/7439 | Eugene Burmako | 2013-12-07 | 5 | -1/+41 |
| | |\ \ \ \ | |||||
| | | * | | | | [backport] SI-7439 Avoid NPE in `isMonomorphicType` with stub symbols. | Jason Zaugg | 2013-12-07 | 5 | -1/+41 |
| * | | | | | | Merge commit 'a774157' into merge/2.10.x-to-master | Jason Zaugg | 2013-12-11 | 2 | -0/+35 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #3223 from retronym/ticket/8010-2.10.x | Eugene Burmako | 2013-12-07 | 2 | -0/+35 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | SI-8010 Fix regression in erasure double definition checks | Jason Zaugg | 2013-12-06 | 2 | -0/+35 |
| | | | |/ / / | | | |/| | | | |||||
| * | | | | | | Merge commit 'f6c6846' into merge/2.10.x-to-master | Jason Zaugg | 2013-12-11 | 0 | -0/+0 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #3232 from xeno-by/topic/macro-error-messages-210x | Jason Zaugg | 2013-12-07 | 19 | -27/+25 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | [nomaster] better error messages for various macro definition errors | Eugene Burmako | 2013-12-06 | 19 | -27/+25 |
| | |/ / / / | |||||
| * | | / / | Merge commit '7e996c1' into merge/2.10.x-to-master | Jason Zaugg | 2013-12-11 | 0 | -0/+0 |
| |\| | | | | | |_|/ / | |/| | | | |||||
| | * | | | Merge pull request #3209 from dotta/SI-7982-on-2.10.x | Jason Zaugg | 2013-12-06 | 8 | -15/+58 |
| | |\ \ \ | |||||
* | | \ \ \ | Merge pull request #3238 from soc/SI-8050 | Adriaan Moors | 2013-12-13 | 4 | -19/+37 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-8050 [Avian] Skip instrumented tests | Simon Ochsenreither | 2013-12-08 | 4 | -19/+37 |
* | | | | | | | Merge pull request #3218 from som-snytt/issue/8027-repl-dbltab | Jason Zaugg | 2013-12-12 | 3 | -9/+64 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-8027 REPL double tab regression | Som Snytt | 2013-12-03 | 3 | -9/+64 |
* | | | | | | | | Merge pull request #3169 from som-snytt/issue/4841-plugin-cp | Jason Zaugg | 2013-12-12 | 9 | -53/+167 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | SI-4841 Plugins get a class path | Som Snytt | 2013-12-06 | 9 | -53/+167 |
* | | | | | | | | Merge pull request #3241 from retronym/ticket/8054 | Jason Zaugg | 2013-12-12 | 2 | -5/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-8054 Fix regression in TypeRef rebind with val overriding object | Jason Zaugg | 2013-12-09 | 2 | -5/+39 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #3255 from densh/pr/unliftable-3 | Jason Zaugg | 2013-12-12 | 34 | -402/+1081 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Address minor pull request feedback points | Den Shabalin | 2013-12-11 | 4 | -5/+3 |