Derek Williams 846d63aa92 Merge branch 'master' into delimited-continuations ... Conflicts: akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala akka-actor/src/main/scala/akka/dispatch/Future.scala project/build/AkkaProject.scala		2011-04-30 08:59:45 -06:00
..
build	Merge branch 'master' into delimited-continuations	2011-04-30 08:59:45 -06:00
plugins	Removed OSGi from all modules except for akka-actor. Added OSGi example.	2011-04-21 11:22:31 +02:00
scripts	Fix dist building	2011-01-22 12:35:44 +13:00
build.properties	Bumping SBT version to 0.7.6-RC0 to fix jline problem with sbt console	2011-04-02 22:11:46 +02:00