summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2855 from adriaanm/modularize-xml-parsersv2.11.0-M5Grzegorz Kossakowski2013-09-06249-14161/+176
|\
| * Fix dbuild meta info: remove scaladoc projectJosh Suereth2013-09-062-37/+18
| * Include xml and parsers in dist, tool classpath.Adriaan Moors2013-08-291-59/+82
| * Don't use sonatype to resolve jars relevant to a release.Adriaan Moors2013-08-281-7/+8
| * Remove scala-xml and scala-parser-combinatorsAdriaan Moors2013-08-27118-10870/+82
| * Prepare removal of scala-xml, scala-parser-combinatorsAdriaan Moors2013-08-27131-3221/+19
* | Merge pull request #2914 from gkossakowski/merge-2.10.xGrzegorz Kossakowski2013-09-0616-5/+396
|\ \
| * \ Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.xGrzegorz Kossakowski2013-09-0516-5/+396
| |\ \
| | * \ Merge pull request #2888 from xeno-by/topic/typed-annotatedJason Zaugg2013-09-044-1/+22
| | |\ \
| | | * | typedAnnotated no longer emits nullsEugene Burmako2013-08-294-1/+22
| | * | | Merge pull request #2901 from gkossakowski/backport-uniques-memory-fixGrzegorz Kossakowski2013-09-046-54/+1446
| | |\ \ \
| | | * | | Modify perRunCaches to not leak WeakReferencesJames Iry2013-09-031-10/+3
| | | * | | SI-7149 Use a WeakHashSet for type uniquenessGrzegorz Kossakowski2013-09-033-2/+50
| | | * | | SI-7150 Replace scala.reflect.internal.WeakHashSetGrzegorz Kossakowski2013-09-034-42/+1393
| | * | | | Merge pull request #2876 from retronym/ticket/7782Jason Zaugg2013-09-043-1/+58
| | |\ \ \ \
| | | * | | | SI-7782 Derive type skolems at the ground levelJason Zaugg2013-08-273-1/+58
| | * | | | | Merge pull request #2899 from som-snytt/issue/4760-parserJason Zaugg2013-09-042-1/+35
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | SI-4760 Parser handles block-ending importSom Snytt2013-08-302-1/+35
| | * | | | | Merge pull request #2891 from som-snytt/issue/7790-no-scriptengineJason Zaugg2013-08-301-0/+2
| | |\ \ \ \ \
| | | * | | | | [nomaster] SI-7790 No ScriptEngine in 2.10 buildSom Snytt2013-08-291-0/+2
| | | | |_|/ / | | | |/| | |
| | * | | | | Merge pull request #2897 from retronym/backport/gitignoreJason Zaugg2013-08-303-35/+48
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Commit .gitignore directlyJason Zaugg2013-08-303-35/+48
| | |/ / / /
| | * | | | Merge pull request #2868 from retronym/ticket/7775Jason Zaugg2013-08-292-2/+23
| | |\ \ \ \
| | | * | | | SI-7775 Harden against the shifting sands of System.getPropertiesJason Zaugg2013-08-262-2/+23
| | * | | | | Merge pull request #2871 from retronym/ticket/7779Jason Zaugg2013-08-295-0/+98
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | SI-7779 Account for class name compactification in reflectionJason Zaugg2013-08-235-0/+98
| | | |/ / /
* | | | | | Merge pull request #2881 from adriaanm/license-cleanupGrzegorz Kossakowski2013-09-051-32/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Change Scala license to unmodified 3-clause BSD.Adriaan Moors2013-09-031-32/+24
* | | | | | Merge pull request #2877 from som-snytt/issue/repl-stack-truncGrzegorz Kossakowski2013-09-047-15/+285
|\ \ \ \ \ \
| * | | | | | SI-7781 Comments to SessionTestSom Snytt2013-09-021-5/+16
| * | | | | | SI-7781 Improve test and add commentSom Snytt2013-09-022-5/+13
| * | | | | | Target junit.clean to clean junit artifactsSom Snytt2013-09-021-1/+5
| * | | | | | SI-7781 REPL stack trunc shows causeSom Snytt2013-09-025-9/+256
|/ / / / / /
* | | | | | Merge pull request #2864 from retronym/ticket/6240-namesJason Zaugg2013-09-023-43/+71
|\ \ \ \ \ \
| * | | | | | Lock down methods in NamesJason Zaugg2013-08-311-11/+14
| * | | | | | SI-6240 Synchronizes NamesJason Zaugg2013-08-223-33/+58
* | | | | | | Merge pull request #2880 from huitseeker/update-artifactoryGrzegorz Kossakowski2013-08-302-3/+3
|\ \ \ \ \ \ \
| * | | | | | | update typesafe.artifactory-online.com to private-repoFrançois Garillot2013-08-272-3/+3
* | | | | | | | Merge pull request #2861 from densh/topic/deprecate-early-type-defsGrzegorz Kossakowski2013-08-309-8/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | deprecate early type defsDen Shabalin2013-08-289-8/+18
* | | | | | | | | Merge pull request #2890 from retronym/topic/one-mans-blissJason Zaugg2013-08-301-10/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Paring back the scope of our shared .gitignoreJason Zaugg2013-08-301-10/+15
* | | | | | | | | | Merge pull request #2886 from gkossakowski/merge-2.10.xJason Zaugg2013-08-3056-76/+558
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \