Merge branch 'master' of git@github.com:jboner/akka

Conflicts: akka-actor/src/main/scala/dispatch/ThreadBasedDispatcher.scala
2010-09-22 15:32:35 +02:00 · 2010-09-22 15:32:35 +02:00 · 044f06d503
commit 044f06d503
parent 9ea09c3e36 52b8edbe6b
25 changed files with 2565 additions and 231 deletions
--- a/akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
+++ b/akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
@ -187,4 +187,4 @@ class ExecutorBasedEventDrivenDispatcher(
    config(this)
    buildThreadPool
  }
-}
+}