Merge remote branch 'akollegger/master' into osgi

Conflicts:
	project/build/AkkaProject.scala
	project/plugins/Plugins.scala
This commit is contained in:
Roman Roelofsen 2010-06-18 11:20:10 +02:00
commit dff7cc65d1
6 changed files with 135 additions and 21 deletions

View file

@ -6,5 +6,5 @@ class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
// val repo = "GH-pages repo" at "http://mpeltonen.github.com/maven/"
// val idea = "com.github.mpeltonen" % "sbt-idea-plugin" % "0.1-SNAPSHOT"
lazy val bnd4sbt = "com.weiglewilczek.bnd4sbt" % "bnd4sbt" % "1.0.0.RC1"
val bnd4sbt = "com.weiglewilczek.bnd4sbt" % "bnd4sbt" % "1.0.0.RC2"
}