aboutsummaryrefslogtreecommitdiffstats
path: root/gradle
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-04-18 19:58:40 +0200
committersteckbrief <steckbrief@chefmail.de>2016-04-18 19:58:40 +0200
commitee0264d98c9a348ea29d12796bed25f9ba1494fb (patch)
treecc559348547e504d37a6efa7826ea0120070babe /gradle
parentd94eb9309b4ab3ee1dfd3cee637b47a52223e15b (diff)
parent7df96caedbbb96a28d4f7e07fa2d159c8ca1373f (diff)
Merge branch 'master' into introduce_cplus_database_version
Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
Diffstat (limited to 'gradle')
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
1 files changed, 1 insertions, 1 deletions
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4632fed3..e1adff10 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sat Nov 22 17:47:57 CET 2014
+#Sat Apr 09 13:15:52 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME