summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3248 from adriaanm/dist-cleanup-licensesAdriaan Moors2013-12-10113-6236/+303
|\
| * Update README, include doc/licenses in distroAdriaan Moors2013-12-107-66/+301
| * Add attribution for Typesafe.Adriaan Moors2013-12-091-0/+2
| * Remove docs/examples; they reside at scala/scala-distAdriaan Moors2013-12-09104-6120/+1
| * Remove unused android test and corresponding license.Adriaan Moors2013-12-093-43/+0
| * Do not distribute partest and its dependencies.Adriaan Moors2013-12-091-8/+0
* | Merge pull request #3222 from skyluc/issue/completion-import-vals-210-7995Adriaan Moors2013-12-096-54/+112
|\ \
| * | SI-7995 completion imported vars and valsLuc Bourlier2013-12-066-54/+112
* | | Merge pull request #3244 from rtyley/si-8019-swing-publisher-check-pf-definedAdriaan Moors2013-12-091-1/+1
|\ \ \ | |_|/ |/| |
| * | SI-8019 Make Publisher check PartialFunction is defined for EventRoberto Tyley2013-12-091-1/+1
|/ /
* | Merge pull request #3229 from retronym/ticket/8029Adriaan Moors2013-12-093-1/+69
|\ \
| * | SI-8029 Avoid multi-run cyclic error with companions, package objectJason Zaugg2013-12-063-1/+69
| |/
* | Merge pull request #3230 from retronym/backport/7439Eugene Burmako2013-12-075-1/+41
|\ \
| * | [backport] SI-7439 Avoid NPE in `isMonomorphicType` with stub symbols.Jason Zaugg2013-12-075-1/+41
* | | Merge pull request #3223 from retronym/ticket/8010-2.10.xEugene Burmako2013-12-072-0/+35
|\ \ \
| * | | SI-8010 Fix regression in erasure double definition checksJason Zaugg2013-12-062-0/+35
| | |/ | |/|
* | | Merge pull request #3232 from xeno-by/topic/macro-error-messages-210xJason Zaugg2013-12-0719-27/+25
|\ \ \ | |_|/ |/| |
| * | [nomaster] better error messages for various macro definition errorsEugene Burmako2013-12-0619-27/+25
|/ /
* | Merge pull request #3209 from dotta/SI-7982-on-2.10.xJason Zaugg2013-12-068-15/+58
|\ \
| * | SI-7982 Changed contract of askLoadedType to unload units by defaultFrançois Garillot2013-12-068-15/+58
* | | Merge pull request #3181 from heathermiller/issue/6913James Iry2013-12-053-5/+8
|\ \ \ | |_|/ |/| |
| * | SI-6913 Fixing semantics of Future fallbackTo to be according to docsHeather Miller2013-12-053-5/+8
|/ /
* | Merge pull request #3208 from dotta/si-7548-on-2.10Jason Zaugg2013-12-027-9/+71
|\ \ | |/ |/|
| * SI-7458 Pres. compiler must not observe trees in silent modeJason Zaugg2013-12-022-6/+8
| * SI-7548 Test to demonstrate residual exploratory typing bugJason Zaugg2013-12-023-0/+30
| * SI-7548 askTypeAt returns the same type whether the source was fully or targe...Mirco Dotta2013-12-024-9/+39
|/
* Merge pull request #3180 from xeno-by/topic/toolbox-rangeposJason Zaugg2013-11-263-2/+16
|\
| * [nomaster] teaches toolbox about -YrangeposEugene Burmako2013-11-223-2/+16
* | Merge pull request #3196 from retronym/topic/3190-fixupJason Zaugg2013-11-2610-8/+178
|\ \ | |/ |/|
| * SI-8005 Fixes NoPositon error for updateDynamic callsSimon Schaefer2013-11-263-1/+45
| * SI-8004 Resolve NoPosition error for applyDynamicNamed method callSimon Schaefer2013-11-263-2/+47
| * SI-7463,SI-8003 Correct wrong position for {select,apply}Dynamic callsSimon Schaefer2013-11-266-5/+86
|/
* 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
|\ \ \ | |/ / |/| |