Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Fix a typo in the `scala` man page | Trent Ogren | 2013-11-18 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #3140 from skyluc/issue/completion-import-object-7280 | Jason Zaugg | 2013-11-18 | 30 | -57/+1037 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | SI-7280 Scope completion not returning members provided by imports | Luc Bourlier | 2013-11-15 | 4 | -24/+248 | |
| * | | | | | | | | | Adds test cases for scope completion | Luc Bourlier | 2013-11-15 | 12 | -0/+707 | |
| * | | | | | | | | | Test infrastructure for scope completion | Jason Zaugg | 2013-11-15 | 14 | -33/+82 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #3136 from dotta/issue/si-7915 | Jason Zaugg | 2013-11-18 | 4 | -3/+34 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | SI-7915 Corrected range positions created during default args expansion | Mirco Dotta | 2013-11-15 | 4 | -3/+34 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #3119 from Ichoran/issue/5263 | James Iry | 2013-11-18 | 4 | -0/+1179 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | New AnyRefMap fixes SI-5263 to the extent practical. | Rex Kerr | 2013-11-18 | 2 | -0/+542 | |
| * | | | | | | | | | New mutable hash map with Long keys: partially solves SI-5263 and is relevant | Rex Kerr | 2013-11-18 | 2 | -0/+637 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #3135 from adriaanm/revive-xml-tests | James Iry | 2013-11-18 | 15 | -0/+336 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Revived tests that once depended on xml | Adriaan Moors | 2013-11-14 | 15 | -0/+336 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #3144 from xuwei-k/foreachValues-scaladoc | James Iry | 2013-11-18 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | fix IntMap#foreachValue and LongMap#foreachValue scaladoc | xuwei-k | 2013-11-15 | 2 | -2/+2 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #3151 from xuwei-k/future-typo | Adriaan Moors | 2013-11-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix typo | xuwei-k | 2013-11-18 | 1 | -1/+1 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #3141 from soc/SI-7961 | Adriaan Moors | 2013-11-17 | 3 | -17/+21 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | SI-7961 Fix false positive procedure warnings | Simon Ochsenreither | 2013-11-14 | 3 | -17/+21 | |
* | | | | | | | | Merge pull request #3145 from dotta/issue/update-eclipse-readme | Adriaan Moors | 2013-11-17 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Added information on how to launch and debug scalac inside Eclipse | Mirco Dotta | 2013-11-15 | 1 | -1/+6 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #3143 from retronym/ticket/reflection-sync-restor | Adriaan Moors | 2013-11-14 | 3 | -2/+9 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Revert "temporarily disables run/reflection-sync-subtypes" | Jason Zaugg | 2013-11-14 | 3 | -2/+9 | |
* | | | | | | | | Merge pull request #3139 from dotta/issue/updated-eclipse-project-files | Adriaan Moors | 2013-11-14 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Updated Eclipse .classpath for partest and scaladoc projects | Mirco Dotta | 2013-11-14 | 2 | -4/+4 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge pull request #3133 from adriaanm/merge-2.10 | Adriaan Moors | 2013-11-14 | 12 | -11/+109 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch '2.10.x' into merge-2.10 | Adriaan Moors | 2013-11-13 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | ||||||
| | * | | | | | | Merge pull request #3116 from retronym/topic/backport-character-ignore | Jason Zaugg | 2013-11-10 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | [backport] Add buildcharacter.properties to .gitignore. | Paul Phillips | 2013-11-10 | 1 | -0/+1 | |
| | |/ / / / / / | ||||||
| | * | | | | | | Merge pull request #3109 from adriaanm/faster-build-2.10 | Adriaan Moors | 2013-11-08 | 2 | -0/+34 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | IDE needs swing/actors/continuations | Adriaan Moors | 2013-11-08 | 1 | -0/+5 | |
| | | * | | | | | | Allow retrieving STARR from non-standard repo for PR validation | Adriaan Moors | 2013-11-06 | 1 | -0/+3 | |
| | | * | | | | | | Allow publishing only core (pr validation) | Adriaan Moors | 2013-11-06 | 1 | -0/+15 | |
| | | * | | | | | | Render relevant properties to buildcharacter.properties | Adriaan Moors | 2013-11-06 | 1 | -0/+11 | |
| | * | | | | | | | Merge pull request #3110 from xeno-by/topic/7776-backport | Eugene Burmako | 2013-11-08 | 3 | -2/+18 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | [backport] SI-7776 post-erasure signature clashes are now macro-aware | Eugene Burmako | 2013-11-08 | 3 | -2/+18 | |
| | * | | | | | | | | Merge pull request #3105 from retronym/ticket/completion | Grzegorz Kossakowski | 2013-11-08 | 4 | -2/+51 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge pull request #3097 from paulp/issue/6546-for-210 | James Iry | 2013-11-06 | 5 | -2/+25 | |
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge pull request #3102 from VladUreche/issue/4012 | James Iry | 2013-11-06 | 2 | -0/+22 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ | Merge commit '6045a05b83' into merge-2.10 | Adriaan Moors | 2013-11-13 | 4 | -2/+52 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Fix completion after application with implicit arguments | Jason Zaugg | 2013-11-06 | 4 | -2/+51 | |
| | |/ / / / / / / / | ||||||
| | | | | | | | | | | ||||||
| | \ \ \ \ \ \ \ \ | ||||||
| *-. \ \ \ \ \ \ \ \ | Merge commit '075f6f260c'; commit 'e09a8a2b7f' into merge-2.10 | Adriaan Moors | 2013-11-13 | 7 | -2/+47 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| / / / / / / | | | |_|/ / / / / / | | |/| | | | | | | | ||||||
| | | * | | | | | | | SI-4012 Mixin and specialization work well | Vlad Ureche | 2013-11-05 | 2 | -0/+22 | |
| | | |/ / / / / / | ||||||
| | * / / / / / / | SI-6546 InnerClasses attribute refers to absent class | Paul Phillips | 2013-11-04 | 5 | -2/+25 | |
| | |/ / / / / / | ||||||
| | * | | | | | | Merge pull request #3072 from retronym/backport/7519 | Adriaan Moors | 2013-10-24 | 6 | -2/+54 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge pull request #3053 from som-snytt/issue/6026-AFCL-findresource | Jason Zaugg | 2013-10-23 | 3 | -1/+33 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge pull request #3052 from som-snytt/issue/6026-javap-loading | Jason Zaugg | 2013-10-23 | 1 | -12/+16 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ | Merge commit '50c8b39ec4' into merge-2.10 | Adriaan Moors | 2013-11-13 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | SI-7519: Additional test case covering sbt/sbt#914 | Mark Harrah | 2013-10-23 | 3 | -0/+26 | |
| | * | | | | | | | | | [nomaster] SI-7519 Less brutal attribute resetting in adapt fallback | Jason Zaugg | 2013-10-23 | 3 | -2/+28 | |
| | |/ / / / / / / / | ||||||
| | * | | | | | | | | Merge pull request #3065 from retronym/ticket/7295 | Jason Zaugg | 2013-10-23 | 1 | -7/+10 | |
| | |\ \ \ \ \ \ \ \ |