aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDierk Koenig <dierk.koenig@canoo.com>2015-08-30 18:05:15 +0200
committerDierk Koenig <dierk.koenig@canoo.com>2015-08-30 18:05:15 +0200
commit427f00a87e531b222d91d1f9b462f8ee68d0f0d4 (patch)
tree665172584eb051b5276b12345bb58a973b96b6bd
parent0fac840c4453c1efaa18cbecbab02018a65a2671 (diff)
parent0fd74d0e77c44bb895e97319d1d8faaacc8a5448 (diff)
downloadfrege-gradle-plugin-427f00a87e531b222d91d1f9b462f8ee68d0f0d4.tar.gz
frege-gradle-plugin-427f00a87e531b222d91d1f9b462f8ee68d0f0d4.tar.bz2
frege-gradle-plugin-427f00a87e531b222d91d1f9b462f8ee68d0f0d4.zip
Merge branch 'master' into SourceSet
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin49875 -> 53636 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
2 files changed, 2 insertions, 2 deletions
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a7634b0..fd7e590 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2bd698e..330b106 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Feb 05 21:33:10 EST 2015
+#Sun Aug 30 17:39:41 CEST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip