Derek Williams 34ca784846 Merge branch 'master' into wip-derekjw ... Conflicts: akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala akka-actor/src/main/scala/akka/actor/Actor.scala akka-actor/src/main/scala/akka/actor/ActorRef.scala akka-actor/src/main/scala/akka/actor/TypedActor.scala akka-actor/src/main/scala/akka/dispatch/Future.scala		2011-07-11 13:02:42 -06:00
..
plugins	Update build and include multi-jvm tests	2011-07-11 09:45:41 +12:00
sbt7	Merge branch 'master' into wip-derekjw	2011-07-11 13:02:42 -06:00
scripts	Allow find-replace to replace versions in the docs	2011-05-26 17:25:31 +12:00
AkkaBuild.scala	Move multi-jvm tests to src/multi-jvm	2011-07-11 11:56:38 +12:00
build.properties	Basis for sbt 0.10 build	2011-07-11 09:45:41 +12:00
Publish.scala	Add publish settings to sbt build	2011-07-11 09:45:41 +12:00
Unidoc.scala	Add unified scaladoc to sbt build	2011-07-11 09:45:41 +12:00