diff options
| author | cyberta <cyberta@riseup.net> | 2019-05-31 07:13:36 -0700 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2019-05-31 07:13:36 -0700 |
| commit | 2f33a76419907c3d613c811fcf07233a8379d345 (patch) | |
| tree | 02c718dacc2befd49d2597cda02451593258bad7 | |
| parent | 3d3b9f40dfc4d6eabb60330c2d3a4029518eb292 (diff) | |
| parent | 156da4996e3b7ae38bbb732b467d5f661fade299 (diff) | |
Merge branch 'update_openvpn' into 'master'
Update openvpn
See merge request leap/bitmask_android!87
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | gradle.properties | 1 | ||||
| m--------- | ics-openvpn | 0 |
3 files changed, 2 insertions, 1 deletions
@@ -67,7 +67,7 @@ id.zip /build-native.sh~ local.properties -gradle.properties* +#gradle.properties* *~ *.iml .idea diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..8fe20ee3 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx4096m diff --git a/ics-openvpn b/ics-openvpn -Subproject 5ebce4dcec19b1b114e19d8a3c6c9ed75907b18 +Subproject 24e914e68ba6c456ee3f8b352d41236c9475977 |