Merge commit '38e8bea3fe'

Browse source

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

...

This commit is contained in:

Jonas Bonér 2010-07-01 17:21:17 +02:00

parent 4ce8ac09a4 70f805bb88

commit 3f3ba3b97d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available