summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 #2608 from retronym/ticket/7532v2.10.2-RC2v2.10.2James Iry2013-05-305-4/+30
| |\
| | * SI-7532 Fix regression in Java inner classfile readerJason Zaugg2013-05-305-4/+30
| * | Merge pull request #2607 from retronym/ticket/7517James Iry2013-05-292-4/+25
| |\ \ | | |/ | |/|
| | * SI-7517 Fix higher kinded type inference regressionJason Zaugg2013-05-302-4/+25
| |/
| * Merge pull request #2601 from retronym/ticket/7516James Iry2013-05-295-5/+20
| |\
| | * SI-7516 Revert "SI-7234 Make named args play nice w. depmet types"Jason Zaugg2013-05-295-5/+20
| * | Merge pull request #2590 from paulp/issue/7486Jason Zaugg2013-05-274-14/+3
| |\ \ | | |/ | |/|
| | * SI-7486 Regressions in implicit search.Paul Phillips2013-05-234-14/+3
| * | Merge pull request #2588 from retronym/ticket/7509Paul Phillips2013-05-263-3/+22
| |\ \ | | |/ | |/|
| | * SI-7509 Avoid crasher as erronous args flow through NamesDefaultsJason Zaugg2013-05-233-3/+22
| |/
* | 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 #2782 from adriaanm/fixup-7636Grzegorz Kossakowski2013-07-291-0/+0
|\ \ \ \
| * | | | Rename t7636-neg.check to the standard t7636.check.Adriaan Moors2013-07-291-0/+0
|/ / / /
* | | | Merge pull request #2750 from retronym/ticket/7455-2.10.xGrzegorz Kossakowski2013-07-274-2/+76
|\ \ \ \
| * | | | SI-7455 Drop dummy param for synthetic access constructorJason Zaugg2013-07-284-2/+76
* | | | | Merge pull request #2738 from retronym/ticket/7636Grzegorz Kossakowski2013-07-273-0/+19
|\ \ \ \ \
| * | | | | SI-7636 Fix a NPE in typing class constructorsChristopher Vogt2013-07-163-0/+19
* | | | | | Merge pull request #2762 from gourlaysama/t7687Grzegorz Kossakowski2013-07-271-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | SI-7687 Handle spaces in %COMSPEC% path in scala.bat.Antoine Gourlay2013-07-231-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #2769 from paulp/pr/backport-272b165a57Adriaan Moors2013-07-253-1/+32
|\ \ \ \ \ | |/ / / / |/| | | |