summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* makes boxity of fast track macros configurableEugene Burmako2013-12-1915-24/+53
* Merge pull request #3236 from xeno-by/topic/wildbox-macrosEugene Burmako2013-12-1710-27/+185
|\
| * drops the redundant typecheck of blackbox expansionsEugene Burmako2013-12-101-2/+1
| * whitebox macros are now first typechecked against outerPtEugene Burmako2013-12-1010-2/+153
| * refactors macroExpandApplyEugene Burmako2013-12-101-27/+35
* | Merge pull request #3273 from paulp/pr/ackAdriaan Moors2013-12-152-20/+36
|\ \
| * | Improvements to partest-ack, plus partest-paths.Paul Phillips2013-12-152-20/+36
|/ /
* | Merge pull request #3272 from adriaanm/modularize-cps-fixAdriaan Moors2013-12-132-2/+2
|\ \
| * | Fix osgi bundle name for continuations.Adriaan Moors2013-12-132-2/+2
|/ /
* | Merge pull request #3221 from adriaanm/modularize-cpsAdriaan Moors2013-12-13251-9643/+71
|\ \
| * | Modularize the swing library.Adriaan Moors2013-12-13104-5445/+19
| * | Modularize continuations plugin.Adriaan Moors2013-12-13153-4203/+57
* | | Merge pull request #3266 from soc/SI-7546Adriaan Moors2013-12-134-11/+19
|\ \ \ | |/ / |/| |
| * | SI-7546 Use likely monotonic clock source for durationsSimon Ochsenreither2013-12-134-11/+19
| |/
* | 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
| | |\ \ \ \ \ \