summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3166 from skyluc/issue/completion-import-object-7280-210Jason Zaugg2013-11-2229-53/+1031
|\
| * [nomaster] SI-7280 Scope completion not returning members provided by importsLuc Bourlier2013-11-214-25/+248
| * [nomaster] Adds test cases for scope completionLuc Bourlier2013-11-2112-0/+707
| * [nomaster] Test infrastructure for scope completionJason Zaugg2013-11-2113-28/+76
* | Merge pull request #3157 from dotta/backport/2.10.x/si-7915Jason Zaugg2013-11-214-3/+34
|\ \ | |/ |/|
| * SI-7915 Corrected range positions created during default args expansionMirco Dotta2013-11-194-3/+34
|/
* Merge pull request #3128 from adriaanm/pax-url-aether-1.6James Iry2013-11-182-3/+6
|\
| * Upgrade pax-url-aether to 1.6.0.Adriaan Moors2013-11-112-3/+6
|/
* 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
|\ \ \ | |/ / |/| |
| * | Fix completion after application with implicit argumentsJason Zaugg2013-11-064-2/+51
* | | Merge pull request #3097 from paulp/issue/6546-for-210James Iry2013-11-065-2/+25
|\ \ \ | |_|/ |/| |
| * | SI-6546 InnerClasses attribute refers to absent classPaul Phillips2013-11-045-2/+25
| |/
* | Merge pull request #3102 from VladUreche/issue/4012James Iry2013-11-062-0/+22
|\ \ | |/ |/|
| * SI-4012 Mixin and specialization work wellVlad Ureche2013-11-052-0/+22
|/
* Merge pull request #3072 from retronym/backport/7519Adriaan Moors2013-10-246-2/+54
|\
| * 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 #3053 from som-snytt/issue/6026-AFCL-findresourceJason Zaugg2013-10-233-1/+33
|\ \
| * | [nomaster] SI-6026 backport getResource bug fixSom Snytt2013-10-183-1/+33
* | | Merge pull request #3052 from som-snytt/issue/6026-javap-loadingJason Zaugg2013-10-231-12/+16
|\ \ \ | |_|/ |/| |
| * | SI-6026 REPL checks for javap before tools.jarSom Snytt2013-10-181-12/+16
| |/
* | Merge pull request #3065 from retronym/ticket/7295Jason Zaugg2013-10-231-7/+10
|\ \ | |/ |/|
| * SI-7295 Fix windows batch file with args containing parenthesesJason Zaugg2013-10-211-7/+10
|/
* Merge pull request #3043 from retronym/topic/flakyJason Zaugg2013-10-178-0/+0
|\
| * Disable tests for SI-7020Jason Zaugg2013-10-173-0/+0
| * Disable flaky presentation compiler test.Jason Zaugg2013-10-175-0/+0
|/
* Merge pull request #2985 from retronym/ticket/7783Jason Zaugg2013-10-036-11/+38
|\
| * SI-7783 Don't issue deprecation warnings for inferred TypeTreesJason Zaugg2013-09-276-11/+38
* | Merge pull request #3009 from adriaanm/2.10.4Jason Zaugg2013-10-021-1/+1
|\ \
| * | Bump version to 2.10.4 for nightliesAdriaan Moors2013-10-011-1/+1
|/ /
* | Merge pull request #2983 from retronym/merge/2.10.3-to-2.10.xJason Zaugg2013-09-244-13/+119
|\ \ | |/ |/|
| * Merge remote-tracking branch 'origin/2.10.3' into merge/2.10.3-to-2.10.xJason Zaugg2013-09-244-13/+119
|/|
| * Merge pull request #2976 from retronym/backport/7862v2.10.3-RC3v2.10.3Jason Zaugg2013-09-231-6/+48
| |\
| | * [nomaster] SI-7862: MANIFEST.MF file for Scala sourcesIulian Dragos2013-09-231-6/+48
| |/
| * Merge pull request #2969 from retronym/ticket/7861Jason Zaugg2013-09-213-7/+71
| |\
| | * SI-7861 Don't execute internal callbacks on the user ExecutorJason Zaugg2013-09-213-7/+71
| |/
| * Merge pull request #2906 from retronym/merge/2.10.x-to-2.10.3v2.10.3-RC2Grzegorz Kossakowski2013-09-1252-319/+2169
| |\
| | * Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.10.3Jason Zaugg2013-09-1226-225/+412
| | |\
| | * | Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.10.3Jason Zaugg2013-09-0430-94/+1757
| |/| |
| * | | Merge pull request #2878 from JamesIry/2.10.3James Iry2013-08-2718-30/+100
| |\ \ \
| | * \ \ Merge branch '2.10.2' into 2.10.3James Iry2013-08-2618-30/+100
| | |\ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 17:44:20 +0000