summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3270 from adriaanm/fix-dist.docAdriaan Moors2013-12-131-3/+0
|\
| * Fixup for #3265Adriaan Moors2013-12-131-3/+0
|/
* Merge pull request #3233 from scottcarey/SI-8042Adriaan Moors2013-12-131-24/+34
|\
| * SI-8042 Use Serialization Proxy Pattern in ListScott Carey2013-12-121-24/+34
* | Merge pull request #3258 from jrudolph/w/fix-typo-that-that-occurs-twice-in-e...Adriaan Moors2013-12-134-4/+4
|\ \
| * | fix typo in error messagesJohannes Rudolph2013-12-104-4/+4
* | | Merge pull request #3240 from soc/SI-7618Adriaan Moors2013-12-133-43/+16
|\ \ \
| * | | SI-7618 Remove octal number literalsSimon Ochsenreither2013-12-093-43/+16
* | | | Merge pull request #3262 from densh/si/8030Adriaan Moors2013-12-137-20/+181
|\ \ \ \
| * | | | SI-8030 force symbols on presentation compiler initializationDen Shabalin2013-12-127-20/+181
| | |/ / | |/| |
* | | | Merge pull request #3250 from soc/SI-8059Adriaan Moors2013-12-133-4/+29
|\ \ \ \
| * | | | SI-8059 Override immutable.Queue#{+:,:+} for performanceSimon Ochsenreither2013-12-113-4/+29
| |/ / /
* | | | Merge pull request #3204 from retronym/topic/patmat-classtag-compoundAdriaan Moors2013-12-133-0/+24
|\ \ \ \
| * | | | Test case for recently improved unchecked warningJason Zaugg2013-12-123-0/+24
* | | | | Merge pull request #3214 from retronym/ticket/8024Adriaan Moors2013-12-136-5/+52
|\ \ \ \ \
| * | | | | SI-8024 Improve user-level toString of package objectsJason Zaugg2013-12-122-5/+9
| * | | | | SI-8024 Fix inaccurate message on overloaded ambiguous identJason Zaugg2013-12-125-6/+29
| * | | | | SI-8024 Pending test case for package object / overloading bugJason Zaugg2013-12-122-0/+20
| |/ / / /
* | | | | Merge pull request #3263 from retronym/ticket/6780Adriaan Moors2013-12-133-28/+67
|\ \ \ \ \
| * | | | | SI-6780 Refactor Context#implicitssJason Zaugg2013-12-111-30/+33
| * | | | | SI-6780 Better handling of cycles in in-scope implicit searchJason Zaugg2013-12-113-9/+45
| | |/ / / | |/| | |
* | | | | Merge pull request #3265 from retronym/merge/2.10.x-to-masterAdriaan Moors2013-12-13124-6211/+562
|\ \ \ \ \
| * \ \ \ \ Merge commit '9cdbe28' into merge/2.10.x-to-masterJason Zaugg2013-12-11113-6150/+344
| |\ \ \ \ \
| | * | | | | Fixup #3248 missed a spot in pack.xmlAdriaan Moors2013-12-101-1/+1
| | * | | | | Merge pull request #3249 from retronym/ticket/7912Adriaan Moors2013-12-102-2/+24
| | |\ \ \ \ \
| | | * | | | | SI-7912 Be defensive calling `toString` in `MatchError#getMessage`Jason Zaugg2013-12-102-2/+24
| | * | | | | | Merge pull request #3251 from retronym/ticket/8060Adriaan Moors2013-12-102-1/+12
| | |\ \ \ \ \ \
| | | * | | | | | SI-8060 Avoid infinite loop with higher kinded type aliasJason Zaugg2013-12-102-1/+12
| | | |/ / / / /
| | * | | | | | 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 commit '0c92704' into merge/2.10.x-to-masterJason Zaugg2013-12-119-61/+183
| |\| | | | | |
| | * | | | | | 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 commit '4d439dd' into merge/2.10.x-to-masterJason Zaugg2013-12-110-0/+0
| |\| | | | | |
| | * | | | | | 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 commit 'a774157' into merge/2.10.x-to-masterJason Zaugg2013-12-112-0/+35
| |\| | | | | | |
| | * | | | | | | 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 commit 'f6c6846' into merge/2.10.x-to-masterJason Zaugg2013-12-110-0/+0
| |\| | | | | | |
| | * | | | | | | 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
| | |/ / / / / /