summaryrefslogtreecommitdiff
path: root/test/files/jvm/concurrent-future.scala
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'execution-context' of github.com:phaller/scala into ↵aleksandar2011-12-121-8/+7
|\ | | | | | | | | | | | | execution-context Conflicts: test/files/jvm/concurrent-future.scala
| * Fix future testsPhilipp Haller2011-12-091-5/+5
| |
* | Syntax changes for the scala.concurrent package and some cleanup.aleksandar2011-12-121-5/+10
|/ | | | | | | | | | block on { } is now changed to: block(timeout) { }
* Add tests for future callbacksPhilipp Haller2011-12-071-0/+118