From 094bc7c7a568b781545fdd4d3bca92fbd82b6740 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 19 Feb 2012 22:41:26 -0500
Subject: [PATCH] version bump

---
 project/Sbt.scala        | 4 ++--
 project/build.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/Sbt.scala b/project/Sbt.scala
index d969fff07..fcc0602d7 100644
--- a/project/Sbt.scala
+++ b/project/Sbt.scala
@@ -15,7 +15,7 @@ object Sbt extends Build
 	override lazy val settings = super.settings ++ buildSettings ++ Status.settings
 	def buildSettings = Seq(
 		organization := "org.scala-sbt",
-		version := "0.12.0-M1",
+		version := "0.12.0-SNAPSHOT",
 		publishArtifact in packageDoc := false,
 		scalaVersion := "2.9.1",
 		publishMavenStyle := false,
@@ -177,7 +177,7 @@ object Sbt extends Build
 		publishAll <<= inAll(nonRoots, publishLocal.task),
 		TaskKey[Unit]("build-all") <<= (publishAll, proguard in Proguard, sxr, doc) map { (_,_,_,_) => () }
 	)
-	def docSetting = inConfig(Compile)(inTask(sxr)(doc in ThisScope.copy(task = Global, config = Global) <<= Defaults.docTask))
+	def docSetting = inConfig(Compile)(inTask(sxr)(Defaults.docSetting(doc in ThisScope.copy(task = Global, config = Global))))
 
 	def interfaceSettings = javaOnly ++ Seq(
 		crossPaths := false,
diff --git a/project/build.properties b/project/build.properties
index f4ff7a5af..84c152ab4 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.11.2
+sbt.version=0.12.0-M1