Merge branch 'remote-actorref-provider'

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2011-09-22 04:38:33 +02:00 · 2011-09-22 04:38:33 +02:00 · 00d3b87586
commit 00d3b87586
parent 099846a716 1bfe3716e2
113 changed files with 1965 additions and 1474 deletions
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@ -1,3 +1,4 @@
+
 /**
 *  Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
 */
@ -770,7 +771,6 @@ trait Promise[T] extends Future[T] {
    }
    fr
  }
-
 }

 //Companion object to FState, just to provide a cheap, immutable default entry