Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/2.10.x' into merge-2.10.x | Paul Phillips | 2012-12-20 | 102 | -610/+1504 |
|\ | |||||
| * | Merge pull request #1781 from vigdorchik/html_template | Adriaan Moors | 2012-12-20 | 1 | -70/+69 |
| |\ | |||||
| | * | scaladoc Template: remove duplicate code and several usages of Option.get. | Eugene Vigdorchik | 2012-12-17 | 1 | -70/+69 |
| * | | Merge pull request #1790 from paulp/2.10.0-wip-merge | Adriaan Moors | 2012-12-20 | 4 | -6/+17 |
| |\ \ | |||||
| | * \ | Merge remote-tracking branch 'origin/2.10.0-wip' into 2.10.0-wip-merge | Paul Phillips | 2012-12-19 | 4 | -6/+17 |
| | |\ \ | |||||
| * | \ \ | Merge pull request #1788 from retronym/ticket/6848 | Paul Phillips | 2012-12-20 | 3 | -1/+5 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Implicit vars should have non-implicit setters. | Jason Zaugg | 2012-12-19 | 3 | -1/+5 |
| * | | | | Merge pull request #1778 from JamesIry/p_SI-6795_2.10.x | Adriaan Moors | 2012-12-19 | 4 | -3/+17 |
| |\ \ \ \ | |||||
| | * | | | | SI-6795 Simplify errors related to "abstract override" on type members | James Iry | 2012-12-10 | 4 | -6/+13 |
| | * | | | | SI-6795 Adds negative check for "abstract override" on types in traits | James Iry | 2012-12-10 | 4 | -3/+10 |
| * | | | | | Merge pull request #1771 from vigdorchik/si_6605 | Adriaan Moors | 2012-12-19 | 5 | -46/+56 |
| |\ \ \ \ \ | |||||
| | * | | | | | Cleanup MemberLookup. Better explain ambiguous link targets. | Eugene Vigdorchik | 2012-12-13 | 5 | -46/+56 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #1772 from gkossakowski/global-deadcode | Adriaan Moors | 2012-12-19 | 2 | -2/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Deprecate `scala.tools.nsc.Phases` because it's dead-code. | Grzegorz Kossakowski | 2012-12-17 | 1 | -0/+1 |
| | * | | | | | Remove dead code from `Global`. | Grzegorz Kossakowski | 2012-12-13 | 1 | -2/+0 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #1709 from retronym/ticket/3995 | Adriaan Moors | 2012-12-19 | 3 | -3/+41 |
| |\ \ \ \ \ | |||||
| | * | | | | | Expand test with a stably qualified example. | Jason Zaugg | 2012-12-05 | 2 | -1/+8 |
| | * | | | | | SI-3995 Exclude companions with an existential prefix. | Jason Zaugg | 2012-12-05 | 3 | -3/+34 |
| * | | | | | | Merge pull request #1727 from scalamacros/ticket/6548 | Paul Phillips | 2012-12-19 | 5 | -14/+28 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | cosmetic renamings in runtime reflection | Eugene Burmako | 2012-12-07 | 2 | -6/+6 |
| | * | | | | | | SI-6548 reflection now correctly enters jinners | Eugene Burmako | 2012-12-07 | 4 | -9/+23 |
| * | | | | | | | Merge pull request #1759 from scalamacros/topic/annotated | Paul Phillips | 2012-12-19 | 5 | -1/+60 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | fixes incorrect handling of Annotated in lazy copier | Eugene Burmako | 2012-12-13 | 5 | -1/+60 |
| * | | | | | | | | Merge pull request #1780 from scalamacros/topic/mima | Adriaan Moors | 2012-12-17 | 1 | -1/+14 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | adds scala-reflect.jar to MIMA in ant | Eugene Burmako | 2012-12-16 | 1 | -1/+14 |
| * | | | | | | | | | Merge pull request #1707 from retronym/ticket/5390 | Adriaan Moors | 2012-12-17 | 10 | -1/+74 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Test showing the absence of a forward reference | Jason Zaugg | 2012-12-16 | 1 | -0/+11 |
| | * | | | | | | | | | SI-5390 Detect forward reference of case class apply | Jason Zaugg | 2012-12-04 | 9 | -1/+63 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1776 from adriaanm/mailmap-2.10.x | Adriaan Moors | 2012-12-17 | 1 | -0/+25 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| | * | | | | | | | | update mailmap | Adriaan Moors | 2012-12-14 | 1 | -0/+25 |
| * | | | | | | | | | Merge pull request #1706 from retronym/ticket/5361 | Adriaan Moors | 2012-12-15 | 4 | -4/+18 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | SI-5361 Refactor in accordance with review comments. | Jason Zaugg | 2012-12-05 | 1 | -6/+7 |
| | * | | | | | | | | | SI-5361 Avoid cyclic type with malformed refinement | Jason Zaugg | 2012-12-04 | 4 | -3/+16 |
| | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1766 from scalamacros/topic/typed-ident-attachments | Eugene Burmako | 2012-12-14 | 6 | -1/+24 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | typedIdent no longer destroys attachments | Eugene Burmako | 2012-12-13 | 6 | -1/+24 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #1754 from retronym/ticket/6288 | Adriaan Moors | 2012-12-14 | 8 | -14/+252 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | * | | | | | | | Expand pattern match position tests. | Jason Zaugg | 2012-12-12 | 2 | -11/+82 |
| | * | | | | | | | SI-6288 Remedy ill-positioned extractor binding. | Jason Zaugg | 2012-12-12 | 3 | -12/+13 |
| | * | | | | | | | SI-6288 Fix positioning of label jumps | Jason Zaugg | 2012-12-12 | 4 | -1/+112 |
| | * | | | | | | | SI-6288 Position argument of unapply | Jason Zaugg | 2012-12-11 | 3 | -2/+57 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #1740 from scalamacros/topic/super-call-args | Paul Phillips | 2012-12-12 | 2 | -9/+9 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | s/SuperCallArgs/SuperArgs/ | Eugene Burmako | 2012-12-10 | 2 | -9/+9 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #1742 from scalamacros/ticket/4044 | Paul Phillips | 2012-12-12 | 2 | -22/+17 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | simplifies checkBounds | Eugene Burmako | 2012-12-13 | 1 | -21/+15 |
| | * | | | | | | | prevents spurious kind bound errors | Eugene Burmako | 2012-12-10 | 2 | -8/+9 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #1758 from hubertp/2.10.x-issue/strip-tvars | Adriaan Moors | 2012-12-12 | 2 | -2/+27 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Recurse into instantiations when stripping type vars. | Hubert Plociniczak | 2012-12-12 | 2 | -2/+27 |
| | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #1747 from hubertp/2.10.x-issue/6758 | Adriaan Moors | 2012-12-12 | 7 | -32/+93 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| | * | | | | | | Fixes SI-6758: force LazyAnnnotationInfo for DefDef and TypeDef | Hubert Plociniczak | 2012-12-11 | 7 | -32/+93 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #1722 from vigdorchik/ide.api | Adriaan Moors | 2012-12-12 | 36 | -496/+664 |
| |\ \ \ \ \ \ |