Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | Merge commit '558c059227' into merge-210 | Paul Phillips | 2013-02-09 | 2 | -0/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '81d8f9d3da' into merge-210 | Paul Phillips | 2013-02-09 | 2 | -0/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Merge commit 'f3cdf146709e0dd98533ee77e8ca2566380cb932' | Lukas Rytz | 2013-02-04 | 5 | -1/+22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'cabf626bbc' into wip/fresh-merge2 | Paul Phillips | 2013-02-01 | 2 | -0/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'b403234a27' into wip/fresh-merge2 | Paul Phillips | 2013-02-01 | 2 | -0/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '644eb7078a' into wip/fresh-merge2 | Paul Phillips | 2013-02-01 | 3 | -32/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'ccd7abe897' into wip/fresh-merge2 | Paul Phillips | 2013-02-01 | 2 | -0/+52 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/2.10.x' into pr/merge-210 | Paul Phillips | 2013-01-29 | 2 | -0/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1864 from retronym/ticket/4859-6 | Paul Phillips | 2013-01-26 | 1 | -0/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | SI-4859 Don't rewrite CC().CC2() to new CC2 | Jason Zaugg | 2013-01-26 | 1 | -0/+17 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add PolyType to Infer#normalize. | Paul Phillips | 2013-01-26 | 1 | -0/+13 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | SI-2577, SI-6860: annotation type inference. | Paul Phillips | 2013-01-26 | 1 | -0/+31 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/2.10.x' into pr/merge-2.10 | Paul Phillips | 2013-01-25 | 5 | -0/+52 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ac432bcde6' into pr/merge-2.10 | Paul Phillips | 2013-01-25 | 5 | -0/+309 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1931 from danielhopkins/remove-pimping | Paul Phillips | 2013-01-25 | 4 | -22/+22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Remove the term "pimp" from the repository | Dan Hopkins | 2013-01-19 | 4 | -22/+22 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1965 from Dinduks/fix_some_typos | Paul Phillips | 2013-01-25 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some typos | Samy Dindane | 2013-01-24 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1939 from soc/SI-6811-moves | Paul Phillips | 2013-01-24 | 3 | -20/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6811 Move scala.util.{automata,regexp} ... | Simon Ochsenreither | 2013-01-21 | 3 | -20/+3 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1921 from soc/SI-6811-removals | Paul Phillips | 2013-01-24 | 9 | -55/+29 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6811 Misc. removals in util, testing, io, ... | Simon Ochsenreither | 2013-01-17 | 2 | -40/+10 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6811 Remove parts of scala.concurrent not needed by scala.actors | Simon Ochsenreither | 2013-01-17 | 1 | -1/+3 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6811 Remove scala.collection.mutable.ConcurrentMap | Simon Ochsenreither | 2013-01-17 | 2 | -3/+13 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6811 Remove deprecated constructors | Simon Ochsenreither | 2013-01-17 | 1 | -8/+0 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6811 Remove usages of scala.annotation.cloneable | Simon Ochsenreither | 2013-01-17 | 3 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '2.10.x' | Adriaan Moors | 2013-01-16 | 8 | -0/+88 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6966 Fix regression in implicit resolution | Jason Zaugg | 2013-01-12 | 1 | -0/+17 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'refs/pull/1844/head' into merge/pr-1844 | Paul Phillips | 2013-01-11 | 8 | -0/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | SI-5923 adapt macros when they are deferred | Eugene Burmako | 2013-01-09 | 8 | -0/+28 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1874 from paulp/pr/mode-value-class | Paul Phillips | 2013-01-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Made "mode" into a value class. | Paul Phillips | 2013-01-09 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6566, unsoundness with alias variance. | Paul Phillips | 2013-01-09 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Boosted test coverage. | Paul Phillips | 2013-01-09 | 1 | -0/+7 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '2.10.x' | Adriaan Moors | 2013-01-08 | 3 | -0/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | adds c.introduceTopLevel | Eugene Burmako | 2013-01-05 | 3 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated copyright to 2013 | Carlo Dapor | 2013-01-02 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1809 from scalamacros/topic/ident-attachments | Paul Phillips | 2012-12-29 | 4 | -0/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes the typedIdent problem for good | Eugene Burmako | 2012-12-28 | 4 | -0/+23 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6846, regression in type constructor inference. | Paul Phillips | 2012-12-28 | 1 | -0/+28 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1786 from retronym/ticket/6745-3 | Paul Phillips | 2012-12-26 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6745 Fix <init> lookup | Jason Zaugg | 2012-12-18 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed old pattern matcher. | Paul Phillips | 2012-12-26 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1506 from som-snytt/issue/6446-plugin-desc | Paul Phillips | 2012-12-22 | 2 | -21/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | PluginComponent contributes description to -Xshow-phases. | Som Snytt | 2012-12-18 | 2 | -21/+0 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1769 from soc/SI-6809 | Adriaan Moors | 2012-12-20 | 5 | -9/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | SI-6809 Forbids deprecated case class definitions without parameter list | Simon Ochsenreither | 2012-12-13 | 5 | -9/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/2.10.x' into merge-2.10.x | Paul Phillips | 2012-12-20 | 12 | -0/+121 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1749 from paulp/pr/6595 | Paul Phillips | 2012-12-12 | 2 | -0/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for SI-6595, lost modifiers in early defs. | Paul Phillips | 2012-12-10 | 2 | -0/+19 |