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
..
plugins	Adding Scalariform plugin	2011-07-19 23:29:33 +02:00
sbt7	Merge branch 'master' into wip-derekjw	2011-07-15 11:31:24 -06:00
scripts	Allow find-replace to replace versions in the docs	2011-05-26 17:25:31 +12:00
AkkaBuild.scala	Merge branch 'master' into wip-derekjw	2011-07-26 12:50:09 -06:00
build.properties	Basis for sbt 0.10 build	2011-07-11 09:45:41 +12:00
Publish.scala	Updating copyright section to Typesafe Inc. etc	2011-07-14 16:03:08 +02:00
Unidoc.scala	Add unified scaladoc to sbt build	2011-07-11 09:45:41 +12:00