Derek Williams 6d343b01f0 Merge branch 'master' into wip-derekjw ... Conflicts: akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala akka-actor/src/main/scala/akka/actor/ActorRef.scala		2011-07-26 12:50:09 -06:00
..
akka-reference.conf	ticket 974: Fix of the ambiguity problem in the Configuration.scala	2011-07-19 16:06:29 +03:00
akka.conf	fixed merge error in conf	2010-09-22 13:14:02 +02:00
akka.test.conf	Added TestEventListener	2011-06-17 16:45:36 -06:00
microkernel-server.xml	Adding microkernel-server.xml to Akka since kernel has moved here	2011-06-12 12:52:44 +02:00