Permalink
Browse files

merge from master

  • Loading branch information...
paulk-asert committed Sep 21, 2012
1 parent 76d6a47 commit 435cc09ccede439a89af03d736d8854b7a58aae2
Showing with 5 additions and 7 deletions.
  1. +1 −3 build.gradle
  2. BIN gradle/wrapper/gradle-wrapper.jar
  3. +2 −2 gradle/wrapper/gradle-wrapper.properties
  4. +2 −2 gradlew
View
@@ -474,9 +474,7 @@ apply from: "gradle/idea.gradle"
apply from: "gradle/groovydoc.gradle"
task wrapper(type: Wrapper) {
-// gradleVersion = '1.0-milestone-5-20110929000016+0200'
-// distributionUrl = "http://repo.gradle.org/gradle/distributions-snapshots/gradle-${gradleVersion}-bin.zip"
- gradleVersion = '1.0'
+ gradleVersion = '1.2'
}
classes {
Binary file not shown.
@@ -1,6 +1,6 @@
-#Thu Jun 14 18:41:31 EST 2012
+#Thu Sep 20 22:25:15 EST 2012
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.2-bin.zip
View
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
##############################################################################
##
@@ -101,7 +101,7 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
- warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

0 comments on commit 435cc09

Please sign in to comment.