summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Remove newPromise methodphaller2012-05-032-6/+0
* | | | | Resolve merge conflictsphaller2012-05-0324-469/+5843
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fixs for reflection and getSimpleName.Paul Phillips2012-05-021-2/+23
| |/ / /
| * | | tpe -> tpeHK here and there.Paul Phillips2012-05-013-10/+10
| * | | Workaround for scaladoc failure.Paul Phillips2012-05-011-1/+1
| * | | Look at all the Strings which no longer are.Paul Phillips2012-05-013-108/+118
| * | | Hackaround for people who like to instantiate the uninstantiable.Paul Phillips2012-05-011-0/+4
| * | | Fixes #SI-5578.Paul Phillips2012-05-011-8/+10
| * | | A little clarity for AddInterfaces.Paul Phillips2012-05-013-43/+52
| * | | Merge commit 'refs/pull/456/head' into developPaul Phillips2012-05-012-160/+5440
| |\ \ \
| | * | | Upgrade jQuery from 1.4.2 to 1.7.2Kato Kazuyoshi2012-05-022-160/+5440
| * | | | Refactor Unsafe related stuff in scala.concurrent.Aleksandar Prokopec2012-05-013-20/+32
| * | | | Refactor OnceCanBuildFrom to check the collection type.Aleksandar Prokopec2012-05-012-6/+16
| * | | | Widen types in signatures of Future companion methods, refactor OnceCanBuildF...Aleksandar Prokopec2012-05-014-39/+62
| * | | | Merge branch 'master' into feature/future-compatAleksandar Prokopec2012-05-0113-552/+380
| |\| | |
| * | | | Merge branch 'master' into feature/future-compatAleksandar Prokopec2012-04-3098-890/+1312
| |\ \ \ \
| * | | | | Fixed a bug with setting execution contexts.Aleksandar Prokopec2012-04-306-55/+63
| * | | | | Porting akka future tests.Aleksandar Prokopec2012-04-271-9/+9
* | | | | | Merge branch 'master' into wip-sip14-fixesphaller2012-05-01360-7852/+6702
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'apr30-checkin' of /scala/trunk into developPaul Phillips2012-04-3010-531/+371
| |\ \ \ \ \
| | * | | | | De-duplication in Contexts.Paul Phillips2012-04-301-14/+12
| | * | | | | Optimization of Predef implicits.Paul Phillips2012-04-309-517/+359
| | | |/ / / | | |/| | |
| * | | | | Merge commit 'refs/pull/452/head'; commit 'refs/pull/453/head' into developPaul Phillips2012-04-302-18/+6
| |\ \ \ \ \
| | * | | | | Presentation Compiler tests for visibility of members.Iulian Dragos2012-04-302-18/+6
| | |/ / / /
| * / / / / Fixed `Setting.enabling` to properly disable dependent settings when the orig...Iulian Dragos2012-04-301-3/+3
| |/ / / /
| * | | | Fighting bitrot with typing.Paul Phillips2012-04-298-119/+81
| * | | | Eliminate useless type parameter.Paul Phillips2012-04-283-3/+3
| * | | | Removed all the imports of the bridge annotation.Paul Phillips2012-04-2820-19/+1
| * | | | @unspecialized annotation.Paul Phillips2012-04-2830-116/+141
| * | | | Removed a few more @deprecated members.Paul Phillips2012-04-287-48/+17
| * | | | Removes @bridge methods.Simon Ochsenreither2012-04-2828-214/+5
| * | | | Revert "Moved ancillary methods off specialized traits."Paul Phillips2012-04-2712-176/+286
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| *---. \ \ \ Merge commit 'refs/pull/445/head'; commit 'refs/pull/446/head'; commit 'refs/...Paul Phillips2012-04-273-10/+16
| |\ \ \ \ \ \
| | | | * | | | fixes SI-5713Eugene Burmako2012-04-271-1/+2
| | |_|/ / / / | |/| | | | |
| | | * | | | essential information about macro expansionEugene Burmako2012-04-271-6/+6
| | |/ / / / | |/| | | |
| | * | | | SI-3755: catch exception thrown by adaptToNewrunAdriaan Moors2012-04-271-3/+8
| |/ / / /
| | | | |
| | \ \ \
| *-. \ \ \ Merge commit 'refs/pull/443/head'; commit 'refs/pull/444/head' into developPaul Phillips2012-04-263-72/+137
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | | * | | SI-5702 Pattern parser halts on starSom Snytt2012-04-262-32/+85
| | * | | | clean up typedMatchAnonFunAdriaan Moors2012-04-261-39/+51
| | * | | | SI-5690: no-selector match in function yields functionAdriaan Moors2012-04-261-1/+1
| | | |/ / | | |/| |
| * | | | Better position printing in NodePrinters.Paul Phillips2012-04-261-12/+36
| * | | | A brand new, fast classfile parser.Paul Phillips2012-04-263-0/+490
| * | | | cleaning up macros, one step at a timeEugene Burmako2012-04-2611-137/+135
| |/ / /
| * | | Trying to set an example in the land of macros.Paul Phillips2012-04-252-95/+111
| * | | More style tips for team macros.Paul Phillips2012-04-251-26/+13
| * | | Reverts 211df62491 .Paul Phillips2012-04-251-67/+37
| | | |
| | \ \
| | \ \
| | \ \
| *---. \ \ Merge commit 'refs/pull/439/head'; commit 'refs/pull/440/head'; commit 'refs/...Paul Phillips2012-04-259-157/+99
| |\ \ \ \ \
| | | | * | | diagnostics for SI-5692Eugene Burmako2012-04-251-3/+10
| | | * | | | fixes SI-5693Eugene Burmako2012-04-254-89/+85
| | | |/ / /
| | * / / / removes Expr <-> Tree implicitsEugene Burmako2012-04-254-65/+4
| | |/ / /