Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'scala/master' into merge-2.10.x | Grzegorz Kossakowski | 2013-07-29 | 11 | -375/+543 |
|\ | |||||
| * | Merge pull request #2746 from soc/topic/paulp-typer-debug-output | Adriaan Moors | 2013-07-29 | 11 | -375/+543 |
| |\ | |||||
| | * | Make -Ytyper-debug output readable. | Paul Phillips | 2013-07-17 | 9 | -299/+481 |
| | * | Cleanups in type printing. | Paul Phillips | 2013-07-17 | 2 | -76/+62 |
* | | | Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.x | Grzegorz Kossakowski | 2013-07-29 | 8 | -49/+250 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge pull request #2750 from retronym/ticket/7455-2.10.x | Grzegorz Kossakowski | 2013-07-27 | 1 | -2/+11 |
| |\ \ | |||||
| | * | | SI-7455 Drop dummy param for synthetic access constructor | Jason Zaugg | 2013-07-28 | 1 | -2/+11 |
| * | | | Merge pull request #2738 from retronym/ticket/7636 | Grzegorz Kossakowski | 2013-07-27 | 1 | -0/+2 |
| |\ \ \ | |||||
| | * | | | SI-7636 Fix a NPE in typing class constructors | Christopher Vogt | 2013-07-16 | 1 | -0/+2 |
| * | | | | Merge pull request #2762 from gourlaysama/t7687 | Grzegorz Kossakowski | 2013-07-27 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | SI-7687 Handle spaces in %COMSPEC% path in scala.bat. | Antoine Gourlay | 2013-07-23 | 1 | -1/+1 |
| * | | | | | [backport] SI-7569 Fix end position in PostfixSelect tree | François Garillot | 2013-07-24 | 1 | -1/+1 |
| |/ / / / | |||||
| * / / / | SI-7657 clarifies the "macro overrides method" rule | Eugene Burmako | 2013-07-14 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Merge pull request #2674 from richdougherty/2.10.x-si7336-try2 | Adriaan Moors | 2013-07-12 | 2 | -24/+197 |
| |\ \ \ | |||||
| | * | | | SI-7336 - Link flatMapped promises to avoid memory leaks | Rich Dougherty | 2013-07-06 | 2 | -24/+197 |
| | |/ / | |||||
| * | | | Merge pull request #2666 from som-snytt/issue/7265-spec-at-least | Adriaan Moors | 2013-07-12 | 1 | -10/+25 |
| |\ \ \ | |||||
| | * | | | SI-7265 General test for spec version | Som Snytt | 2013-07-04 | 1 | -10/+25 |
| * | | | | Merge pull request #2721 from retronym/ticket/7649 | Adriaan Moors | 2013-07-12 | 1 | -8/+8 |
| |\ \ \ \ | |||||
| | * | | | | SI-7649 Fix positions for reshaped tag materializers | Jason Zaugg | 2013-07-11 | 1 | -8/+8 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #2716 from SethTisue/terribly-important-typo-fix | Adriaan Moors | 2013-07-12 | 2 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | fix typo in BigInt/BigDecimal deprecation messages | Seth Tisue | 2013-07-08 | 2 | -2/+2 |
| | |/ / / | |||||
| * | | | | Merge pull request #2689 from scalamacros/ticket/7617 | Adriaan Moors | 2013-07-12 | 2 | -3/+37 |
| |\ \ \ \ | |||||
| | * | | | | SI-7617 typedAssign no longer expands lhs | Eugene Burmako | 2013-07-09 | 1 | -1/+4 |
| | * | | | | makes it more convenient to work with SuppressMacroExpansionAttachment | Eugene Burmako | 2013-06-28 | 2 | -2/+33 |
| * | | | | | SI-7638 Superaccessor lookup after specialization | Vlad Ureche | 2013-07-08 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #2739 from retronym/ticket/7668 | Adriaan Moors | 2013-07-29 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | SI-7668 Better return type inheritance for dep. method types | Jason Zaugg | 2013-07-16 | 1 | -0/+3 |
* | | | | | | Merge pull request #2737 from retronym/ticket/7669 | Adriaan Moors | 2013-07-29 | 1 | -5/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-7669 Fix exhaustivity warnings for recursive ADTs. | Jason Zaugg | 2013-07-17 | 1 | -5/+16 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #2690 from soc/SI-7620 | Adriaan Moors | 2013-07-29 | 1 | -7/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-7620 Remove floating-point-literals-without-digit-after-dot | Simon Ochsenreither | 2013-06-28 | 1 | -7/+4 |
* | | | | | | | Merge pull request #2733 from soc/SI-6811-text | Grzegorz Kossakowski | 2013-07-27 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-6811 Deprecate scala.text | Simon Ochsenreither | 2013-07-14 | 1 | -0/+8 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #2751 from soc/SI-7592-defaultmapmodel | Grzegorz Kossakowski | 2013-07-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-7592 Deprecate s.c.m.DefaultMapModel | Simon Ochsenreither | 2013-07-19 | 1 | -0/+1 |
* | | | | | | | | Merge pull request #2754 from soc/SI-7679-remove-standardscalasettings-make | Grzegorz Kossakowski | 2013-07-27 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-7679 Remove deprecated StandardScalaSettings#make | Simon Ochsenreither | 2013-07-20 | 1 | -2/+0 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #2756 from soc/SI-7681-dead-code-settinggroup | Grzegorz Kossakowski | 2013-07-27 | 1 | -7/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-7681 Remove dead code in s.t.n.s.AbsScalaSettings | Simon Ochsenreither | 2013-07-20 | 1 | -7/+0 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #2758 from soc/SI-7681-dead-code-phases | Grzegorz Kossakowski | 2013-07-27 | 3 | -60/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-7681 Clean up scala.reflect.internal.util.TableDef | Simon Ochsenreither | 2013-07-20 | 2 | -17/+8 |
| * | | | | | | | | SI-7681 Remove scala.tools.nsc.Phases | Simon Ochsenreither | 2013-07-20 | 1 | -43/+0 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #2757 from soc/SI-7681-dead-code-changes | Grzegorz Kossakowski | 2013-07-27 | 1 | -221/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-7681 Remove s.t.n.d.Changes (dead code) | Simon Ochsenreither | 2013-07-20 | 1 | -221/+0 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #2765 from retronym/ticket/7689 | Grzegorz Kossakowski | 2013-07-27 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-7689 Fix typing regression with default arguments | Jason Zaugg | 2013-07-24 | 1 | -1/+2 |
* | | | | | | | | | Merge pull request #2766 from xuwei-k/request/mergeable-either-value-class | Grzegorz Kossakowski | 2013-07-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | MergeableEither extends AnyVal | xuwei-k | 2013-07-24 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #2772 from som-snytt/issue/6123-fix-test | Grzegorz Kossakowski | 2013-07-27 | 1 | -9/+12 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | SI-7695 Macro debug output on -explaintypes | Som Snytt | 2013-07-27 | 1 | -9/+12 |
| |/ / / / / / / / |