Jonas Bonér 117eb3bf92 Merge branch 'wip-typed-actor-jboner' into master ... Conflicts: akka-core/src/test/scala/ActiveObjectContextSpec.scala akka-core/src/test/scala/ActiveObjectGuiceConfiguratorSpec.scala akka-core/src/test/scala/ActorObjectUtilFunctionsSpec.scala akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala akka-core/src/test/scala/NestedTransactionalTypedActorSpec.scala akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala akka-core/src/test/scala/RemoteTransactionalTypedActorSpec.scala akka-core/src/test/scala/RestartNestedTransactionalActiveObjectSpec.scala akka-core/src/test/scala/RestartNestedTransactionalTypedActorSpec.scala akka-core/src/test/scala/RestartTransactionalActiveObjectSpec.scala akka-core/src/test/scala/RestartTransactionalTypedActorSpec.scala akka-core/src/test/scala/TransactionalActiveObjectSpec.scala akka-core/src/test/scala/TransactionalTypedActorSpec.scala akka-core/src/test/scala/TypedActorContextSpec.scala akka-core/src/test/scala/TypedActorGuiceConfiguratorSpec.scala akka-core/src/test/scala/TypedActorUtilFunctionsSpec.scala akka-core/src/test/scala/actor/ActiveObjectContextSpec.scala akka-core/src/test/scala/actor/ActiveObjectGuiceConfiguratorSpec.scala akka-core/src/test/scala/actor/ActiveObjectLifecycleSpec.scala akka-core/src/test/scala/actor/ActorObjectUtilFunctionsSpec.scala akka-core/src/test/scala/actor/NestedTransactionalActiveObjectSpec.scala akka-core/src/test/scala/actor/RestartNestedTransactionalActiveObjectSpec.scala akka-core/src/test/scala/actor/RestartTransactionalActiveObjectSpec.scala akka-core/src/test/scala/actor/TransactionalActiveObjectSpec.scala akka-core/src/test/scala/remote/RemoteTransactionalActiveObjectSpec.scala		2010-07-28 20:21:59 +02:00
..
AkkaProject.scala	Merge branch 'wip-typed-actor-jboner' into master	2010-07-28 20:21:59 +02:00