summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'scala/2.10.x'Grzegorz Kossakowski2013-08-2956-76/+558
|\
| * Merge pull request #2860 from retronym/merge/2.10.2-to-2.10.xJames Iry2013-08-2618-30/+108
| |\
| | * SI-7486 More tests for cycles triggered by implicit searchJason Zaugg2013-08-212-0/+8
| | * Merge remote-tracking branch 'origin/2.10.2' into merge/2.10.2-to-2.10.xJason Zaugg2013-08-2118-30/+100
| | |\
| * | \ Merge pull request #2870 from retronym/ticket/7778Adriaan Moors2013-08-234-0/+17
| |\ \ \ | | |/ / | |/| |
| | * | SI-942 A test case, five years adrift.Jason Zaugg2013-08-234-0/+17
| |/ /
| * | Merge pull request #2838 from retronym/ticket/7716v2.10.3-RC1James Iry2013-08-162-1/+19
| |\ \
| | * | SI-7716 Exclude patmat synthetics from bounds checkingJason Zaugg2013-08-162-1/+19
| * | | Merge pull request #2842 from retronym/ticket/7603-2James Iry2013-08-162-30/+14
| |\ \ \
| | * | | SI-7603 Remove diagnostic code for annotation errorJason Zaugg2013-08-161-8/+0
| | * | | SI-7603 Fix thread safety of FlagTranslationJason Zaugg2013-08-161-22/+14
| | |/ /
| * | | Merge pull request #2814 from xeno-by/topic/auto-duplicate-expansionsJames Iry2013-08-1611-5/+107
| |\ \ \ | | |/ / | |/| |
| | * | [nomaster] macro expansions are now auto-duplicatedEugene Burmako2013-08-1411-5/+107
| * | | Merge pull request #2834 from retronym/ticket/7752James Iry2013-08-153-4/+60
| |\ \ \
| | * | | SI-7752 Don't disambiguate type parameters of overloaded altsJason Zaugg2013-08-153-4/+60
| |/ / /
| * | | Merge pull request #2829 from adriaanm/ticket-7014James Iry2013-08-144-3/+29
| |\ \ \
| | * | | SI-7014 Annot arg may refer to annotated class's memberAdriaan Moors2013-08-134-3/+29
| * | | | Merge pull request #2828 from adriaanm/rebase-2771James Iry2013-08-139-13/+134
| |\ \ \ \
| | * | | | SI-7694 Add @uncheckedBounds to the libraryJason Zaugg2013-08-133-0/+60
| | * | | | SI-7694 @uncheckedBounds, an opt-out from type bounds checkingJason Zaugg2013-08-136-13/+74
| | |/ / /
| * | | | Merge pull request #2826 from retronym/ticket/7020-2.10.xAdriaan Moors2013-08-134-4/+53
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | SI-7020 Determinism for pattern matcher warningsJason Zaugg2013-08-134-4/+53
| * | | | Merge pull request #2809 from xeno-by/ticket/7733James Iry2013-08-1310-14/+54
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [nomaster] SI-7733 reflective packages now more consistent with scalacEugene Burmako2013-08-1310-14/+54
| | |/ /
| * | | Merge pull request #2813 from xeno-by/topic/showrawGrzegorz Kossakowski2013-08-122-1/+3
| |\ \ \
| | * | | showRaw now prints symbols of def treesEugene Burmako2013-08-102-1/+3
| * | | | Merge pull request #2817 from xeno-by/topic/toolbox-current-run-compilesJason Zaugg2013-08-123-1/+34
| |\ \ \ \
| | * | | | currentRun.compiles now correctly works in toolboxesEugene Burmako2013-08-103-1/+34
| | | |/ / | | |/| |
| * | | | Merge pull request #2818 from xeno-by/topic/macro-expansion-error-posJason Zaugg2013-08-127-1/+36
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [nomaster] macro errors now always have positionsEugene Burmako2013-08-107-1/+36
| |/ / /
| * | | Merge pull request #2800 from densh/topic/toolbox-positionsEugene Burmako2013-08-088-6/+51
| |\ \ \
| | * | | SI-7331 tb.parse returns unpositioned treesDen Shabalin2013-08-088-6/+51
| |/ / /
| * | | Merge pull request #2767 from gourlaysama/t4907Adriaan Moors2013-08-051-2/+66
| |\ \ \
| | * | | SI-4907 SI-4615 scala.bat honors -J and -D options.Antoine Gourlay2013-07-281-2/+66
| * | | | Merge pull request #2761 from scalamacros/ticket/7510Jason Zaugg2013-08-017-3/+53
| |\ \ \ \
| | * | | | brings JavaMirrors up to speed with ClassfileParserEugene Burmako2013-07-237-3/+53
| | |/ / /
* | | | | Merge pull request #2874 from paulp/pr/depthAdriaan Moors2013-08-2726-226/+254
|\ \ \ \ \
| * | | | | Logging cleanup.Paul Phillips2013-08-2518-65/+88
| * | | | | Value class Depth.Paul Phillips2013-08-2511-161/+166
* | | | | | Merge pull request #2850 from gourlaysama/wip/t6507-2Adriaan Moors2013-08-252-6/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | SI-6507 completely sidestep handlers in REPL when :silent in onAntoine Gourlay2013-08-182-6/+5
* | | | | | Merge pull request #2873 from paulp/pr/partest-ackAdriaan Moors2013-08-241-79/+79
|\ \ \ \ \ \
| * | | | | | Overhaul of partest-ack.Paul Phillips2013-08-241-79/+79
|/ / / / / /
* | | | | | Merge pull request #2867 from mmorearty/patch-1Adriaan Moors2013-08-231-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo in sample code in scaladoc for package scala.sys.processMike Morearty2013-08-231-1/+1
* | | | | | | Merge pull request #2858 from Debilski/docstring-fixAdriaan Moors2013-08-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | ProcessBuilder.lines(log) *does* throw an exception.Rike-Benjamin Schuppner2013-08-201-1/+1
* | | | | | | | Merge pull request #2805 from adriaanm/rebase-2715James Iry2013-08-231-471/+593
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Golfed about 20 lines into the sand trap.Paul Phillips2013-08-081-37/+20
| * | | | | | | skipping trips to specializeTypes when not necessary in constructorsMiguel Garcia2013-08-081-3/+13