summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Small cleanup in typeref toStringPaul Phillips2012-04-131-4/+4
* Touching the untouchable.Paul Phillips2012-04-132-25/+54
*-. Merge commit 'refs/pull/385/head'; commit 'refs/pull/386/head' into developPaul Phillips2012-04-1343-434/+2184
|\ \
| | * Scaladoc feature that shows implicit conversionsVlad Ureche2012-04-1341-263/+2001
| * | performance counters for macros expansionsEugene Burmako2012-04-132-171/+183
* | | Portability changes to binary-repo-lib.sh.Paul Phillips2012-04-131-2/+8
* | | Introducing some whitespace before colons.Paul Phillips2012-04-132-17/+5
| |/ |/|
* | Fixes https://scala-webapps.epfl.ch/jenkins/job/scala-checkin-rangpos/404/Eugene Burmako2012-04-131-2/+1
|/
* Fix for failing test.Paul Phillips2012-04-131-2/+2
* Merge commit 'refs/pull/383/head' into developPaul Phillips2012-04-139-76/+133
|\
| * Add managed blockers to execution contexts.aleksandar2012-04-131-1/+17
| * Fixing a failing test.aleksandar2012-04-122-22/+20
| * Making changes in the scala.concurrent package.aleksandar2012-04-127-53/+96
* | Merge commit 'refs/pull/376/head' into developPaul Phillips2012-04-134-110/+121
|\ \
| * | Moving Duration DSL to a separate package.Vojin Jovanovic2012-04-124-110/+121
| | |
| \ \
*-. \ \ Merge commit 'refs/pull/380/head'; commit 'refs/pull/381/head' into developPaul Phillips2012-04-134-11/+78
|\ \ \ \
| | * | | SI-5510: string interpolation: parser no longer hangs on unclosed stringDominik Gruntz2012-04-133-2/+34
| * | | | Cache consistency checks for starr binary repo.Josh Suereth2012-04-121-9/+44
| |/ / /
* | | | Merge pull request #277 from VladUreche/hack/spaces-scriptJosh Suereth2012-04-122-0/+135
|\ \ \ \
| * | | | Space/Tab cleanup script - run before committingVlad Ureche2012-03-162-0/+135
* | | | | Adjustment to recent fix.Paul Phillips2012-04-131-5/+3
* | | | | Merge commit 'refs/pull/379/head'Paul Phillips2012-04-122-2/+2
|\ \ \ \ \
| * | | | | fixes petty macro testsEugene Burmako2012-04-122-2/+2
* | | | | | Workaround for SI-5657.Paul Phillips2012-04-123-0/+18
* | | | | | Workaround for SI-5583.Paul Phillips2012-04-123-7/+46
* | | | | | Fix for SI-5535.Paul Phillips2012-04-123-1/+31
|/ / / / /
* | | | | fixes petty macro testsEugene Burmako2012-04-1273-196/+230
* | | | | Reconfigure build.xml so -Xmacros isn't lost.Paul Phillips2012-04-121-2/+3
* | | | | Revert "Enabled continuations plugin by default."Paul Phillips2012-04-123-12/+15
| |/ / / |/| | |
* | | | New starr with implicit classes and macros.Paul Phillips2012-04-123-3/+3
* | | | Merge commit 'refs/pull/375/head' into developPaul Phillips2012-04-121111-4834/+14576
|\ \ \ \
| * | | | GroundTypeTag => ConcreteTypeTagEugene Burmako2012-04-1258-310/+320
| * | | | Next generation of macrosEugene Burmako2012-04-121111-4838/+14570
* | | | | Disabling failing tests.Paul Phillips2012-04-125-0/+0
| | | | |
| \ \ \ \
*-. \ \ \ \ Merge commit 'refs/pull/373/head'; commit 'refs/pull/374/head' into developPaul Phillips2012-04-1214-136/+228
|\ \ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fixes and clean ups for futures based on review by @viktorklangphaller2012-04-124-29/+15
| | |/ / /
| * | | | Fixed duplicate method problem for implicit wrappers.Martin Odersky2012-04-111-0/+1
| * | | | Implementation of SIP 13 take 2.Martin Odersky2012-04-114-28/+33
| * | | | Implementation of SIP 13 - implicit classesMartin Odersky2012-04-116-83/+133
| * | | | new annotation targets for companion classes/objects/factory methods.Martin Odersky2012-04-115-5/+55
| | |_|/ | |/| |
| | | |
| \ \ \
*-. \ \ \ Merge commit 'refs/pull/367/head'; commit 'refs/pull/369/head'; commit 'refs/...Paul Phillips2012-04-125-55/+32
|\ \ \ \ \
| | * | | | This change enables the alphanumeric method to be called from SecureRandomgakuzzzz2012-04-121-9/+11
| | |/ / /
| * | | | Merge branch 'master' of https://github.com/scala/scalaDominik Gruntz2012-04-123-45/+20
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge pull request #369 from scalamacros/topic/fixwinscriptsJosh Suereth2012-04-113-45/+20
| | |\ \ \ | | | |/ / | | |/| |
| | | * | fix for get-scala-commit-* on Windows (tested with Windows 7)Eugene Burmako2012-04-113-45/+20
| | |/ /
| * / / changed applyDynamic explanation in trait DynamicDominik Gruntz2012-04-111-1/+1
| |/ /
* / / Fix memory leak related to default arguments in presentation compiler.Lukas Rytz2012-04-103-6/+7
|/ /
| |
| \
*-. \ Merge commit 'refs/pull/365/head'; commit 'refs/pull/366/head' into developPaul Phillips2012-04-102-2/+6
|\ \ \
| | * | SI-5571: adds @volatile to field Enumeration.vsetDefinedDominik Gruntz2012-04-101-1/+1
| * | | fix field init problem in NoStackTraceAdriaan Moors2012-04-101-1/+5
| |/ /