Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' into scala-2.8

Conflicts:
	project/build.properties
  • Loading branch information...
commit 2dba10b9728849029c16064005a356825ddb0f31 2 parents 01e968d + 4823db1
Ross A. Baker rossabaker authored

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. +1 1  project/build.properties
2  project/build.properties
... ... @@ -1,7 +1,7 @@
1 1 #Project properties
2 2 project.organization=com.thinkminimo.step
3 3 project.name=step-parent
4   -project.version=1.1.6-SNAPSHOT
  4 +project.version=1.2.0
5 5 sbt.version=0.7.3
6 6 def.scala.version=2.7.7
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.