summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ / / /
| | * | | | Merge pull request #3065 from retronym/ticket/7295Jason Zaugg2013-10-231-7/+10
| | |\ \ \ \
| * | \ \ \ \ Merge commit '25bcba59ce' into merge-2.10Adriaan Moors2013-11-131-7/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | SI-7295 Fix windows batch file with args containing parenthesesJason Zaugg2013-10-211-7/+10
| | |/ / / /
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge commit 'e350bd2cbc'; commit '2bfe0e797c2b9c57277475c9296e36cbf868b7db' ...Adriaan Moors2013-11-130-0/+0
| |\ \ \ \ \ \ | | | | |/ / / | | | |/| / / | | | |_|/ / | | |/| | |
| | | * | | SI-6026 REPL checks for javap before tools.jarSom Snytt2013-10-181-12/+16
| | | |/ /
| | * / / [nomaster] SI-6026 backport getResource bug fixSom Snytt2013-10-183-1/+33
| | |/ /
* | | | Merge pull request #3142 from skyluc/bad-markdown-guidelinesGrzegorz Kossakowski2013-11-141-1/+1
|\ \ \ \
| * | | | Fixes markdown syntaxLuc Bourlier2013-11-141-1/+1
|/ / / /
* | | | Merge pull request #3127 from RajivKurian/OpenHashMap-nextPowerOfTwo-implemen...Adriaan Moors2013-11-131-3/+2
|\ \ \ \
| * | | | Use an intrinsic for the next power of two calculation and also return the in...Rajiv2013-11-111-3/+2
* | | | | Merge pull request #3129 from adriaanm/pr-rebase-3001Adriaan Moors2013-11-13277-692/+1133
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | blackbox restriction #4: can't customize pattern matchingEugene Burmako2013-11-128-4/+62
| * | | | blackbox restriction #3: can't affect implicit searchEugene Burmako2013-11-1214-64/+125
| * | | | blackbox restriction #2: can't guide type inferenceEugene Burmako2013-11-1212-5/+100
| * | | | blackbox restriction #1: can't refine the official return typeEugene Burmako2013-11-1219-31/+89
| * | | | blackbox and whitebox macrosEugene Burmako2013-11-12246-619/+788
* | | | | Merge pull request #3090 from densh/pull/undo-forAdriaan Moors2013-11-1333-557/+1046
|\ \ \ \ \
| * | | | | add comments that explain FreshName extractor from Quasiquotes cakeDen Shabalin2013-11-121-0/+4
| * | | | | add comments that explain new for loop enumerator encodingDen Shabalin2013-11-121-0/+28
| * | | | | test legacy .filter support in for loop resugaringDen Shabalin2013-11-121-0/+11
| * | | | | re-implement hasAttachment directly in raw attachmentsDen Shabalin2013-11-122-1/+5