Skip to content
Browse files

Merge branch 'master' into scala-2.8

Conflicts:
	project/build.properties
  • Loading branch information...
2 parents 01e968d + 4823db1 commit 2dba10b9728849029c16064005a356825ddb0f31 @rossabaker rossabaker committed May 25, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 project/build.properties
View
2 project/build.properties
@@ -1,7 +1,7 @@
#Project properties
project.organization=com.thinkminimo.step
project.name=step-parent
-project.version=1.1.6-SNAPSHOT
+project.version=1.2.0
sbt.version=0.7.3
def.scala.version=2.7.7
build.scala.versions=2.8.0.RC2 2.8.0.RC1 2.8.0.Beta1

0 comments on commit 2dba10b

Please sign in to comment.
Something went wrong with that request. Please try again.