Merge branch 'develop' into mz-automation-develop

pull/11/head
Stefan Feuerhahn 8 years ago
commit 54a902e0de

1
.gitignore vendored

@ -22,3 +22,4 @@ gradle-app.setting
.apt_generated/ .apt_generated/
#created by openiec61850 clientgui: #created by openiec61850 clientgui:
lastconnection.properties lastconnection.properties
.idea

Binary file not shown.

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip

Loading…
Cancel
Save