summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'common-build-script'Paul Phillips2011-12-091-3/+8
|\
| * Making path to settings.xml configurable.Paul Phillips2011-12-091-3/+8
* | Merge branch 'common-build-script'Paul Phillips2011-12-091-2/+10
|\|
| * Boiling more logic out of jenkins.Paul Phillips2011-12-091-2/+10
* | Added per-file stats to -Dscala.timings.Paul Phillips2011-12-091-2/+26
* | Disabled another presentation compiler test.Paul Phillips2011-12-093-0/+0
* | Merge branch 'common-build-script'Paul Phillips2011-12-092-18/+23
|\|
| * Swimming with the jenkins current.Paul Phillips2011-12-092-18/+23
* | Merge branch 'common-build-script'Paul Phillips2011-12-092-0/+60
|\|
| * Separated build and publish scripts.Paul Phillips2011-12-093-35/+60
| * Unified 2.8.x and 2.9.x build scripts.Paul Phillips2011-12-091-8/+13
| * Moved jenkins build script.Paul Phillips2011-12-091-0/+30
* | Merge remote-tracking branch 'jsuereth/dont_resolve_non_lib_dirs'Paul Phillips2011-12-081-2/+2
|\ \
| * | Binary resolution limited.Josh Suereth2011-12-081-2/+2
* | | Deleted the sbt 0.7 project.Paul Phillips2011-12-0819-1878/+0
* | | Merge remote-tracking branches 'VladUreche/issue/5054' and 'jsuereth/dont_res...Paul Phillips2011-12-0848-203/+163
|\ \ \
| * | | Ensure sha files don't go to productionJosh Suereth2011-12-081-1/+3
| |/ /
| | |
| | \
| | \
| | \
| *---. \ Merge remote-tracking branches 'soc/SI-4990', 'fedgehog/docs_fix_for_scala.Ei...Paul Phillips2011-12-0733-155/+88
| |\ \ \ \
| | | | * | Fix reflective toolbox producing invalid bytecodeEugene Burmako2011-12-076-13/+7
| | | * | | Fix documentation errorfedgehog2011-12-071-4/+4
| | | |/ /
| | * / / Migration message and version cleanupSimon Ochsenreither2011-12-0726-138/+77
| | |/ /
| * | | Merge remote-tracking branch 'kepler/topic/reflectivecompiler' into developPaul Phillips2011-12-071-0/+6
| |\ \ \
| | * | | Reflective compiler now crashes properlyEugene Burmako2011-12-071-0/+6
| * | | | Restructed Enumeration a little.Paul Phillips2011-12-071-21/+14
| * | | | More warnings eliminations.Paul Phillips2011-12-0711-20/+32
| * | | | Changed shadowed constructor parameter names.Paul Phillips2011-12-072-6/+20
| | |/ / | |/| |
* / | | Fixed #5054, #5287Vlad Ureche2011-12-0811-23/+186
|/ / /
* | | Merge remote-tracking branch 'soc/scaladoc-spacing' into developPaul Phillips2011-12-062-11/+10
|\ \ \
| * | | Fixes the annoying spaces between name, type params and params in ScalaDoc.Simon Ochsenreither2011-12-062-11/+10
* | | | Merge branch 'master' of /scala/trunk into developPaul Phillips2011-12-061-0/+5
|\ \ \ \
| * | | | Gave Option its own nonEmpty.Paul Phillips2011-12-061-0/+5
* | | | | Merge remote-tracking branches 'blair/documentation-typo-fix' and 'blair/remo...Paul Phillips2011-12-0622-25/+25
|\ \ \ \ \
| * | | | | Fix documentation stutters.Blair Zajac2011-12-0622-25/+25
| |/ / / /
* / / / / Fix documentation typo.Blair Zajac2011-12-061-1/+1
|/ / / /
* | / / Update scaladoc links to collections overview.Josh Marcus2011-12-0628-38/+34
| |/ / |/| |
| | |
| \ \
*-. \ \ Merge remote-tracking branches 'kepler/topic/dumpclasses' and 'joshmarcus/col...Paul Phillips2011-12-0530-3/+93
|\ \ \ \
| | * | | Enhanced scaladoc of collection classes with links to the relevant pages of "...Josh Marcus2011-12-0527-0/+68
| * | | | -Ydump-classes: the option to dump the generated bytecodeluajalla2011-12-053-3/+25
* | | | | Disabled non-deterministic tests.Paul Phillips2011-12-0561-0/+0
| | | | |
| \ \ \ \
*-. \ \ \ \ Merge remote-tracking branches 'kepler/topic/reifycopypaste' and 'kepler/topi...Paul Phillips2011-12-0560-1/+1201
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| | * | | | Another test pack for reflectionEugene Burmako2011-12-0559-0/+1200
| * | | | | A minor fix to -Yreify-copypaste.Eugene Burmako2011-12-051-1/+1
| |/ / / /
* | | | | Don't generate redundant interfaces.Paul Phillips2011-12-051-1/+13
* | | | | Merge remote-tracking branch 'szeiger/fix/scala-script-on-mingw'Paul Phillips2011-12-051-5/+17
|\ \ \ \ \
| * | | | | Fix path mangling for 'scala' shell script on MinGW/MSYS.Stefan Zeiger2011-12-051-5/+17
| |/ / / /
* | | | | Merge remote-tracking branch 'szeiger/fix/windows-git-revision'Paul Phillips2011-12-051-1/+0
|\ \ \ \ \
| * | | | | Fix build on Windows.Stefan Zeiger2011-12-051-1/+0
| |/ / / /
* / / / / Tweaks to get-scala-revision.Paul Phillips2011-12-052-3/+10
|/ / / /
* | | | Use git-describe to create build string.Paul Phillips2011-12-043-51/+15
* | | | Merge remote-tracking branch 'kepler/topic/reifytests'Paul Phillips2011-12-0428-0/+352
|\ \ \ \