Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/5.0.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
SethTisue committed Apr 5, 2013
2 parents aa4b702 + b89df2c commit 7c6ae92
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.12.2
sbt.version=0.12.3
4 changes: 2 additions & 2 deletions sbt
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ DISABLE_EXT_DIRS=-Djava.ext.dirs=
BOOT=xsbt.boot.Boot


SBT_LAUNCH=$HOME/.sbt/sbt-launch-0.12.2.jar
URL='http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.2/sbt-launch.jar'
SBT_LAUNCH=$HOME/.sbt/sbt-launch-0.12.3.jar
URL='http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.3/sbt-launch.jar'

if [ ! -f $SBT_LAUNCH ] ; then
echo "downloading" $URL
Expand Down

0 comments on commit 7c6ae92

Please sign in to comment.