summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Resolve merge conflictsphaller2012-05-0332-470/+6833
|\
| * Fixs for reflection and getSimpleName.Paul Phillips2012-05-023-2/+79
| * 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-012-1/+32
| * Fixes #SI-5578.Paul Phillips2012-05-013-8/+53
| * 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-016-277/+329
| * | Merge branch 'master' into feature/future-compatAleksandar Prokopec2012-05-0125-972/+1066
| |\|
| * | Merge branch 'master' into feature/future-compatAleksandar Prokopec2012-04-30156-969/+1735
| |\ \
| * | | Add promises tests.Aleksandar Prokopec2012-04-302-0/+227
| * | | Fixed a bug with setting execution contexts.Aleksandar Prokopec2012-04-307-57/+201
| * | | Porting akka future tests.Aleksandar Prokopec2012-04-273-9/+480
* | | | Merge branch 'master' into wip-sip14-fixesphaller2012-05-01739-9728/+13528
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'apr30-checkin' of /scala/trunk into developPaul Phillips2012-04-3013-536/+376
| |\ \ \
| | * | | De-duplication in Contexts.Paul Phillips2012-04-301-14/+12
| | * | | Optimization of Predef implicits.Paul Phillips2012-04-3012-522/+364
| | | |/ | | |/|
| * | | Merge commit 'refs/pull/452/head'; commit 'refs/pull/453/head' into developPaul Phillips2012-04-3011-433/+687
| |\ \ \
| | * | | Presentation Compiler tests for visibility of members.Iulian Dragos2012-04-3011-433/+687
| | |/ /
| * / / 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-2834-91/+59
| * | Removes @bridge methods.Simon Ochsenreither2012-04-2828-214/+5
| * | Another tedious day at Checkfile Ranch.v2.10.0-M3Paul Phillips2012-04-271-1/+1
| * | Merge commit '2bd62d2cfff47882eb72768cfb054638ed0f039b'Paul Phillips2012-04-272-2/+8
| |\ \
| | * | fixes broken eval testsEugene Burmako2012-04-272-2/+8
| * | | Revert "Moved ancillary methods off specialized traits."Paul Phillips2012-04-2715-184/+294
| | | |
| | \ \
| | \ \
| | \ \
| *---. | | Merge commit 'refs/pull/445/head'; commit 'refs/pull/446/head'; commit 'refs/...Paul Phillips2012-04-277-10/+50
| |\ \ \| |
| | | | * | fixes SI-5713Eugene Burmako2012-04-275-1/+36
| | | * | | essential information about macro expansionEugene Burmako2012-04-271-6/+6
| | | |/ /
| | * / / SI-3755: catch exception thrown by adaptToNewrunAdriaan Moors2012-04-271-3/+8
| | |/ /
| * / / Maybe this will fix the test on windows.Paul Phillips2012-04-271-1/+1
| |/ /
| | |
| | \
| *-. \ Merge commit 'refs/pull/443/head'; commit 'refs/pull/444/head' into developPaul Phillips2012-04-2620-98/+346
| |\ \ \
| | | * | SI-5702 Pattern parser halts on starSom Snytt2012-04-2618-58/+276
| | * | | clean up typedMatchAnonFunAdriaan Moors2012-04-261-39/+51
| | * | | SI-5690: no-selector match in function yields functionAdriaan Moors2012-04-262-1/+19
| | | |/ | | |/|
| * | | Better position printing in NodePrinters.Paul Phillips2012-04-261-12/+36
| * | | A brand new, fast classfile parser.Paul Phillips2012-04-268-0/+612
| * | | 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-254-101/+117
| * | More style tips for team macros.Paul Phillips2012-04-251-26/+13
| * | Reverts 211df62491 .Paul Phillips2012-04-251-67/+37