summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix completion after application with implicit argumentsJason Zaugg2013-11-064-2/+51
* Merge pull request #3072 from retronym/backport/7519Adriaan Moors2013-10-246-2/+54
|\
| * SI-7519: Additional test case covering sbt/sbt#914Mark Harrah2013-10-233-0/+26
| * [nomaster] SI-7519 Less brutal attribute resetting in adapt fallbackJason Zaugg2013-10-233-2/+28
* | Merge pull request #3053 from som-snytt/issue/6026-AFCL-findresourceJason Zaugg2013-10-233-1/+33
|\ \
| * | [nomaster] SI-6026 backport getResource bug fixSom Snytt2013-10-183-1/+33
* | | Merge pull request #3052 from som-snytt/issue/6026-javap-loadingJason Zaugg2013-10-231-12/+16
|\ \ \ | |_|/ |/| |
| * | SI-6026 REPL checks for javap before tools.jarSom Snytt2013-10-181-12/+16
| |/
* | Merge pull request #3065 from retronym/ticket/7295Jason Zaugg2013-10-231-7/+10
|\ \ | |/ |/|
| * SI-7295 Fix windows batch file with args containing parenthesesJason Zaugg2013-10-211-7/+10
|/
* Merge pull request #3043 from retronym/topic/flakyJason Zaugg2013-10-178-0/+0
|\
| * Disable tests for SI-7020Jason Zaugg2013-10-173-0/+0
| * Disable flaky presentation compiler test.Jason Zaugg2013-10-175-0/+0
|/
* Merge pull request #2985 from retronym/ticket/7783Jason Zaugg2013-10-036-11/+38
|\
| * SI-7783 Don't issue deprecation warnings for inferred TypeTreesJason Zaugg2013-09-276-11/+38
* | Merge pull request #3009 from adriaanm/2.10.4Jason Zaugg2013-10-021-1/+1
|\ \
| * | Bump version to 2.10.4 for nightliesAdriaan Moors2013-10-011-1/+1
|/ /
* | 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 #2916 from retronym/ticket/7818Jason Zaugg2013-09-102-1/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-7818 Cast our way out of extended existential angstJason Zaugg2013-09-062-1/+16
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #2922 from huitseeker/issue/7767Jason Zaugg2013-09-103-0/+21
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #1 from retronym/ticket/7767-testFrançois Garillot2013-09-092-0/+19
| |\ \ \ \ \ \ \ \
| | * | | | | | | | SI-7767 Test case for Scaladoc on early initializersJason Zaugg2013-09-092-0/+21
| |/ / / / / / / /
| * | / / / / / / SI-7767 avoid rejecting Scaladoc comments in early initializersFrançois Garillot2013-09-091-0/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2866 from retronym/ticket/7269Jason Zaugg2013-09-093-3/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | SI-7269 Rework MapLike#retains to account for desugaring changeJason Zaugg2013-08-293-3/+37
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #2911 from retronym/ticket/7814Jason Zaugg2013-09-097-167/+214
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | SI-7814 Updates the instrumented version of ScalaRuntime.Jason Zaugg2013-09-055-156/+70
| * | | | | | | SI-7814 Avoid init cycle between Predef, `package`, ScalaRuntimeJason Zaugg2013-09-053-11/+144
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2895 from som-snytt/issue/7652-tools-jar-backportGrzegorz Kossakowski2013-09-082-13/+24
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [nomaster] SI-7652 REPL extended quest for toolsSom Snytt2013-08-291-12/+23
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 17:37:34 +0000