Merge branch '2.9.x' of github.com:colladoc/colladoc into 2.9.x

colladoc · Aug 15, 2011 · e7caf2c · e7caf2c
2 parents c1dc5ba + 319ae28
commit e7caf2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/project/plugins/build.sbt b/project/plugins/build.sbt
@@ -1,9 +1,11 @@
 seq(
+  libraryDependencies += "com.github.mpeltonen" %% "sbt-idea" % "0.10.0-SNAPSHOT",
   libraryDependencies <+= sbtVersion("com.github.siasia" %% "xsbt-web-plugin" % _),
   libraryDependencies <+= sbtVersion("com.github.siasia" %% "xsbt-proguard-plugin" % _)
 )
 
 resolvers ++= Seq(
+  "sbt-idea-repo" at "http://mpeltonen.github.com/maven/",
   "Web plugin repo" at "http://siasia.github.com/maven2",
   "Proguard plugin repo" at "http://siasia.github.com/maven2"
 )
diff --git a/scala b/scala