diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-07 11:00:43 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-07 11:00:43 +0100 |
| commit | 13d154326aaf34798c1232a42318fd71e9df9779 (patch) | |
| tree | 4ad051ddb4e6faa11b5c67795e9285bb64d1648a /app/build.gradle | |
| parent | 0009911f6b9320b3bea541f88fcdc30364d2a681 (diff) | |
| parent | 6544b8d32ccf81a6c1d832217642b873be8dc6b7 (diff) | |
Merge branch 'develop' into release-0.8.0
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/build.gradle b/app/build.gradle index 9207ff84..9c1d5b4e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'android' -import org.ajoberstar.grgit.* +//import org.ajoberstar.grgit.* android { compileSdkVersion 19 @@ -58,7 +58,7 @@ def processFileInplace(file, Closure processText) { task checkoutStrippedIcsOpenVPN ( type: Copy ) { //FIXME Checkout ics-openvpn-stripped from branch "ics-openvpn-upstream" - grgit = Grgit.open(project.file('../')) + //grgit = Grgit.open(project.file('../')) from '../../bitmask_android_tmp/ics-openvpn-stripped' into '../ics-openvpn-stripped' |