Merge branch 'master' into scala-2.8

Conflicts: project/build.properties
jannehietamaki · May 25, 2010 · 2dba10b · 2dba10b
2 parents 01e968d + 4823db1
commit 2dba10b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/project/build.properties b/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