Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'execution-context' of github.com:phaller/scala into ↵ | aleksandar | 2011-12-12 | 1 | -8/+7 |
|\ | | | | | | | | | | | | | execution-context Conflicts: test/files/jvm/concurrent-future.scala | ||||
| * | Fix future tests | Philipp Haller | 2011-12-09 | 1 | -5/+5 |
| | | |||||
* | | Syntax changes for the scala.concurrent package and some cleanup. | aleksandar | 2011-12-12 | 1 | -5/+10 |
|/ | | | | | | | | | | block on { } is now changed to: block(timeout) { } | ||||
* | Add tests for future callbacks | Philipp Haller | 2011-12-07 | 1 | -0/+118 |