summaryrefslogtreecommitdiff
path: root/src/library/scala/concurrent/ExecutionContext.scala
diff options
context:
space:
mode:
authoraleksandar <aleksandar@lampmac14.epfl.ch>2012-01-12 14:59:10 +0100
committeraleksandar <aleksandar@lampmac14.epfl.ch>2012-01-12 15:01:52 +0100
commitd43d5e5e22e61061cd84ab8b69b237249a519994 (patch)
treede0f61f48b41e499001dabc6c8be314b2a08dd31 /src/library/scala/concurrent/ExecutionContext.scala
parent5a4b555c378d79d57b59dfd6edafd2b9a59866bb (diff)
downloadscala-d43d5e5e22e61061cd84ab8b69b237249a519994.tar.gz
scala-d43d5e5e22e61061cd84ab8b69b237249a519994.tar.bz2
scala-d43d5e5e22e61061cd84ab8b69b237249a519994.zip
Changing trait CanBlock name to CanAwait.
Diffstat (limited to 'src/library/scala/concurrent/ExecutionContext.scala')
-rw-r--r--src/library/scala/concurrent/ExecutionContext.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala
index b7b3e901e6..2de080a822 100644
--- a/src/library/scala/concurrent/ExecutionContext.scala
+++ b/src/library/scala/concurrent/ExecutionContext.scala
@@ -28,6 +28,6 @@ trait ExecutionContext {
}
-sealed trait CanBlock
+sealed trait CanAwait