diff options
author | Parménides GV <parmegv@sdf.org> | 2014-09-26 13:04:26 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-09-26 13:04:26 +0200 |
commit | bbf877a099112acbf34589b01503c3f5ee135dc0 (patch) | |
tree | 101d4fb8e347bd040ad963248611fd1684a12cd9 /.gitignore | |
parent | 0a3900e145866c2f5b0adbd8c9c3fac2fb56efcb (diff) | |
parent | 22b7ee4614a2f47d55496de8a9b55040c0f4ba85 (diff) |
Merge branch 'develop'0.7.0
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -52,7 +52,6 @@ bitmask_android/assets/minivpn.armeabi-v7a bitmask_android/assets/minivpn.mips bitmask_android/assets/minivpn.x86 openvpn/a.out.dSYM -openvpn/config-version.h openvpn/config.status Makefile openvpn/libtool @@ -76,9 +75,9 @@ gradle.properties* build .gradle jniLibs -bitmask_android/ovpnlibs/ G* *.dot /ics-openvpn/ /TAGS /ics-openvpn +app/ovpnlibs |