Merge branch 'master' into osgi

Conflicts:
	project/build/AkkaProject.scala
	project/plugins/Plugins.scala
This commit is contained in:
Heiko Seeberger 2010-07-19 18:05:47 +02:00
commit 96d79154f3
205 changed files with 7432 additions and 2776 deletions

View file

@ -1,6 +1,8 @@
import sbt._
class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
val embeddedRepo = "Embedded Repo" at (info.projectPath / "embedded-repo").asURL.toString
val codeFellow = "de.tuxed" % "codefellow-plugin" % "0.3" // for code completion and more in VIM
// val repo = "GH-pages repo" at "http://mpeltonen.github.com/maven/"
// val idea = "com.github.mpeltonen" % "sbt-idea-plugin" % "0.1-SNAPSHOT"