Endre Sándor Varga 55be17419e Merge branch 'master' into wip-2053d-actorbased-remote-drewhk ... Conflicts: akka-docs/rst/java/code/docs/serialization/SerializationDocTestBase.java akka-docs/rst/scala/code/docs/serialization/SerializationDocSpec.scala akka-remote-tests/src/main/scala/akka/remote/testconductor/NetworkFailureInjector.scala akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala		2012-12-18 15:15:01 +01:00
..
_sphinx	Repointing the link for the downloads.	2012-10-24 14:38:20 +02:00
rst	Merge branch 'master' into wip-2053d-actorbased-remote-drewhk	2012-12-18 15:15:01 +01:00
.history	Tests are green with new Futures, consider this a half-way-there marker	2011-12-11 00:40:52 +01:00
Makefile	Add options for creating epub output for the documentation	2012-05-17 22:58:57 +02:00