Patrik Nordwall 5a2ebb172d Merge branch 'master' into wip-2537-doc-remote-deploy-java-patriknw ... Conflicts: akka-docs/rst/java/code/docs/remoting/RemoteActorExample.java		2012-09-21 17:01:13 +02:00
..
_sphinx	various documentation patches, found at the bottom of my inbox	2012-09-17 21:25:41 +02:00
rst	Merge branch 'master' into wip-2537-doc-remote-deploy-java-patriknw	2012-09-21 17:01:13 +02: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