summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3153 from misfo/patch-1v2.11.0-M7James Iry2013-11-181-1/+1
|\
| * Fix a typo in the `scala` man pageTrent Ogren2013-11-181-1/+1
* | Merge pull request #3140 from skyluc/issue/completion-import-object-7280Jason Zaugg2013-11-1830-57/+1037
|\ \
| * | SI-7280 Scope completion not returning members provided by importsLuc Bourlier2013-11-154-24/+248
| * | Adds test cases for scope completionLuc Bourlier2013-11-1512-0/+707
| * | Test infrastructure for scope completionJason Zaugg2013-11-1514-33/+82
* | | Merge pull request #3136 from dotta/issue/si-7915Jason Zaugg2013-11-184-3/+34
|\ \ \
| * | | SI-7915 Corrected range positions created during default args expansionMirco Dotta2013-11-154-3/+34
* | | | Merge pull request #3119 from Ichoran/issue/5263James Iry2013-11-184-0/+1179
|\ \ \ \
| * | | | New AnyRefMap fixes SI-5263 to the extent practical.Rex Kerr2013-11-182-0/+542
| * | | | New mutable hash map with Long keys: partially solves SI-5263 and is relevantRex Kerr2013-11-182-0/+637
* | | | | Merge pull request #3135 from adriaanm/revive-xml-testsJames Iry2013-11-1815-0/+336
|\ \ \ \ \
| * | | | | Revived tests that once depended on xmlAdriaan Moors2013-11-1415-0/+336
| | |/ / / | |/| | |
* | | | | Merge pull request #3144 from xuwei-k/foreachValues-scaladocJames Iry2013-11-182-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fix IntMap#foreachValue and LongMap#foreachValue scaladocxuwei-k2013-11-152-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #3151 from xuwei-k/future-typoAdriaan Moors2013-11-171-1/+1
|\ \ \ \
| * | | | fix typoxuwei-k2013-11-181-1/+1
* | | | | Merge pull request #3141 from soc/SI-7961Adriaan Moors2013-11-173-17/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | SI-7961 Fix false positive procedure warningsSimon Ochsenreither2013-11-143-17/+21
* | | | | Merge pull request #3145 from dotta/issue/update-eclipse-readmeAdriaan Moors2013-11-171-1/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Added information on how to launch and debug scalac inside EclipseMirco Dotta2013-11-151-1/+6
|/ / / /
* | | | Merge pull request #3143 from retronym/ticket/reflection-sync-restorAdriaan Moors2013-11-143-2/+9
|\ \ \ \
| * | | | Revert "temporarily disables run/reflection-sync-subtypes"Jason Zaugg2013-11-143-2/+9
* | | | | Merge pull request #3139 from dotta/issue/updated-eclipse-project-filesAdriaan Moors2013-11-142-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Updated Eclipse .classpath for partest and scaladoc projectsMirco Dotta2013-11-142-4/+4
* | | | | Merge pull request #3133 from adriaanm/merge-2.10Adriaan Moors2013-11-1412-11/+109
|\ \ \ \ \
| * \ \ \ \ Merge branch '2.10.x' into merge-2.10Adriaan Moors2013-11-130-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #3116 from retronym/topic/backport-character-ignoreJason Zaugg2013-11-101-0/+1
| | |\ \ \ \ \
| | | * | | | | [backport] Add buildcharacter.properties to .gitignore.Paul Phillips2013-11-101-0/+1
| | |/ / / / /
| | * | | | | Merge pull request #3109 from adriaanm/faster-build-2.10Adriaan Moors2013-11-082-0/+34
| | |\ \ \ \ \
| | | * | | | | IDE needs swing/actors/continuationsAdriaan Moors2013-11-081-0/+5
| | | * | | | | Allow retrieving STARR from non-standard repo for PR validationAdriaan Moors2013-11-061-0/+3
| | | * | | | | Allow publishing only core (pr validation)Adriaan Moors2013-11-061-0/+15
| | | * | | | | Render relevant properties to buildcharacter.propertiesAdriaan Moors2013-11-061-0/+11
| | * | | | | | Merge pull request #3110 from xeno-by/topic/7776-backportEugene Burmako2013-11-083-2/+18
| | |\ \ \ \ \ \
| | | * | | | | | [backport] SI-7776 post-erasure signature clashes are now macro-awareEugene Burmako2013-11-083-2/+18
| | * | | | | | | Merge pull request #3105 from retronym/ticket/completionGrzegorz Kossakowski2013-11-084-2/+51
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #3097 from paulp/issue/6546-for-210James Iry2013-11-065-2/+25
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #3102 from VladUreche/issue/4012James Iry2013-11-062-0/+22
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge commit '6045a05b83' into merge-2.10Adriaan Moors2013-11-134-2/+52
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Fix completion after application with implicit argumentsJason Zaugg2013-11-064-2/+51
| | |/ / / / / / /
| | | | | | | | |
| | \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ Merge commit '075f6f260c'; commit 'e09a8a2b7f' into merge-2.10Adriaan Moors2013-11-137-2/+47
| |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| / / / / / | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | SI-4012 Mixin and specialization work wellVlad Ureche2013-11-052-0/+22
| | | |/ / / / /
| | * / / / / / SI-6546 InnerClasses attribute refers to absent classPaul Phillips2013-11-045-2/+25
| | |/ / / / /
| | * | | | | Merge pull request #3072 from retronym/backport/7519Adriaan Moors2013-10-246-2/+54
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge pull request #3053 from som-snytt/issue/6026-AFCL-findresourceJason Zaugg2013-10-233-1/+33
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #3052 from som-snytt/issue/6026-javap-loadingJason Zaugg2013-10-231-12/+16
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge commit '50c8b39ec4' into merge-2.10Adriaan Moors2013-11-130-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | SI-7519: Additional test case covering sbt/sbt#914Mark Harrah2013-10-233-0/+26
| | * | | | | | | | [nomaster] SI-7519 Less brutal attribute resetting in adapt fallbackJason Zaugg2013-10-233-2/+28
| | |/ / / / / / /