Jonas Bonér
|
1a7d7966c0
|
Merge commit '38e8bea3fe'
Conflicts:
akka-core/src/main/scala/actor/ActorRef.scala
akka-core/src/test/java/se/scalablesolutions/akka/actor/ActiveObjectFailer.java
akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
akka-core/src/test/scala/RemoteSupervisorSpec.scala
akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala
akka-core/src/test/scala/SupervisorSpec.scala
akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
|
2010-07-01 17:21:17 +02:00 |
|