summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2996 from paulp/pr/3971Jason Zaugg2013-09-274-1/+47
|\
| * SI-3971 error message carat mispoints at curried methods.Paul Phillips2013-09-274-1/+47
* | Merge pull request #2998 from paulp/pr/6120Paul Phillips2013-09-2718-18/+130
|\ \
| * | SI-6120 multiple warnings at same position.Paul Phillips2013-09-2718-18/+130
| |/
* | Merge pull request #2987 from paulp/pr/emptySelfTypePaul Phillips2013-09-2728-57/+57
|\ \
| * | SI-6762 rename emptyValDef to noSelfType.Paul Phillips2013-09-2728-57/+57
| |/
* | Merge pull request #2995 from paulp/pr/defaultparamJason Zaugg2013-09-276-14/+15
|\ \
| * | Fix up DEFAULTPARAM semantics.Paul Phillips2013-09-276-14/+15
* | | Merge pull request #2963 from sjrd/topic/hooks-for-scala-jsAdriaan Moors2013-09-272-4/+17
|\ \ \
| * | | Move logic checking valid names from ClassPath to ClassPathContextSébastien Doeraene2013-09-231-3/+9
| * | | Add back the newClassLoader hook in SymbolLoaders.Sébastien Doeraene2013-09-231-1/+8
* | | | Merge pull request #2997 from retronym/merge/2.10.x-to-master-2Adriaan Moors2013-09-2710-15/+144
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-master-2Jason Zaugg2013-09-2710-15/+144
| |\ \ \ | | |_|/ | |/| |
| | * | Merge pull request #2983 from retronym/merge/2.10.3-to-2.10.xJason Zaugg2013-09-244-13/+119
| | |\ \
| | | * | Merge remote-tracking branch 'origin/2.10.3' into merge/2.10.3-to-2.10.xJason Zaugg2013-09-244-13/+119
| | |/| |
| | | * | Merge pull request #2976 from retronym/backport/7862v2.10.3-RC3v2.10.3Jason Zaugg2013-09-231-6/+48
| | | |\ \
| | | | * | [nomaster] SI-7862: MANIFEST.MF file for Scala sourcesIulian Dragos2013-09-231-6/+48
| | | |/ /
| | | * | Merge pull request #2969 from retronym/ticket/7861Jason Zaugg2013-09-213-7/+71
| | | |\ \
| | | | * | SI-7861 Don't execute internal callbacks on the user ExecutorJason Zaugg2013-09-213-7/+71
| | | |/ /
| | | * | Merge pull request #2906 from retronym/merge/2.10.x-to-2.10.3v2.10.3-RC2Grzegorz Kossakowski2013-09-1252-319/+2169
| | | |\ \
| | | | * \ Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.10.3Jason Zaugg2013-09-1226-225/+412
| | | | |\ \
| | | | * | | Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.10.3Jason Zaugg2013-09-0430-94/+1757
| | | |/| | |
| | | * | | | Merge pull request #2878 from JamesIry/2.10.3James Iry2013-08-2718-30/+100
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '2.10.2' into 2.10.3James Iry2013-08-2618-30/+100
| | | | |\ \ \ \
| | * | | \ \ \ \ Merge pull request #2919 from retronym/ticket/7815Jason Zaugg2013-09-232-2/+32
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | SI-7815 Dealias before deeming method type as dependentJason Zaugg2013-09-072-2/+32
| | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge pull request #2893 from adriaanm/backport-2880-2.10.xGrzegorz Kossakowski2013-09-112-3/+3
| | |\ \ \ \ \ \
| | | * | | | | | update typesafe.artifactory-online.com to private-repoFrançois Garillot2013-08-292-3/+3
| | * | | | | | | Merge pull request #2882 from adriaanm/license-cleanup-2.10.xGrzegorz Kossakowski2013-09-111-32/+24
| | |\ \ \ \ \ \ \
| | | * | | | | | | Change Scala license to unmodified 3-clause BSD.Adriaan Moors2013-09-031-32/+24
| | * | | | | | | | Merge pull request #2923 from retronym/ticket/7825Grzegorz Kossakowski2013-09-116-6/+73
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | SI-7398 Enable test for Java 8 source parser under Java 8Jason Zaugg2013-09-101-4/+2
| | | * | | | | | | | SI-7825 Consider DEFAULTMETHOD when refchecking concretenessJason Zaugg2013-09-105-2/+71
* | | | | | | | | | | Merge pull request #2999 from retronym/topic/mailmap-francoisJason Zaugg2013-09-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | A .mailmap entry for @huitseekerJason Zaugg2013-09-271-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2979 from retronym/ticket/7870Jason Zaugg2013-09-263-3/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SI-7870 Detect default getter clashes in constructorsJason Zaugg2013-09-233-3/+12
* | | | | | | | | | | Merge pull request #2990 from retronym/ticket/7876Jason Zaugg2013-09-268-7/+81
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SI-7876 Less dealiasing in Scaladoc's type printing.Jason Zaugg2013-09-264-5/+33
| * | | | | | | | | | | SI-7876 Scaladoc crasher due to regression in isFunctionType.Jason Zaugg2013-09-264-2/+48
* | | | | | | | | | | | Merge pull request #2988 from sschaef/remove-octal-literalsAdriaan Moors2013-09-264-25/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove octal escape literals from the codebaseSimon Schaefer2013-09-254-25/+25
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2982 from retronym/topic/checkinitAdriaan Moors2013-09-243-0/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SI-4742 Make -Xcheckinit aware of constants.Jason Zaugg2013-09-243-0/+9
* | | | | | | | | | | | Merge pull request #2980 from huitseeker/revert-2957Jason Zaugg2013-09-2461-530/+482
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add position check for regression introduced by #2957François Garillot2013-09-242-0/+56
| * | | | | | | | | | | Revert "Merge pull request #2957 from paulp/pr/parser-improvements"François Garillot2013-09-2459-530/+426
* | | | | | | | | | | | Merge pull request #2975 from retronym/ticket/7868Jason Zaugg2013-09-235-4/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | SI-7868 Account for numeric widening in match translationJason Zaugg2013-09-235-4/+43
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #2938 from Ichoran/issue/7725Jason Zaugg2013-09-231-3/+26
|\ \ \ \ \ \ \ \ \ \ \