Permalink
Browse files

Merge branch 'master' of https://github.com/kutchar/libkestrel into k…

…utchar-master

Conflicts:
	project/Build.scala
  • Loading branch information...
Stephan Zuercher
Stephan Zuercher committed Nov 27, 2012
2 parents 3620e09 + 204069a commit 3ecc8b49f00a6180d1049aa5c0a2b04027d1521d
Showing with 3 additions and 1 deletion.
  1. +1 −1 project/Build.scala
  2. +2 −0 project/build.properties
View
@@ -3,7 +3,7 @@ import Keys._
import com.twitter.sbt._
object Libkestrel extends Build {
- val utilVersion = "5.3.13"
+ val utilVersion = "5.3.14"
lazy val root = Project(
id = "libkestrel",
View
@@ -0,0 +1,2 @@
+sbt.version=0.11.2
+

0 comments on commit 3ecc8b4

Please sign in to comment.