summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-04-28 12:00:44 +0200
committerParménides GV <parmegv@sdf.org>2014-04-28 12:00:44 +0200
commitdec816eecc8375d9f031a4b59753302e8ab9b16c (patch)
tree47751f7773abe880beaeea939b0b5825f351124e /.gitignore
parent5fc5d37330d3535a0f421632694d1e7918fc22d7 (diff)
parentd4caf8f35fc9dd43d370439e8f6b6727909b15b9 (diff)
Merge branch 'develop'0.5.1
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore11
1 files changed, 6 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 4f4b96a7..c4d9ae2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,10 +47,10 @@ openvpn/src/Makefile.in
openvpn/src/compat/Makefile.in
openvpn/src/openvpnserv/Makefile.in
openvpn/tests/Makefile.in
-app/assets/minivpn.armeabi
-app/assets/minivpn.armeabi-v7a
-app/assets/minivpn.mips
-app/assets/minivpn.x86
+bitmask_android/assets/minivpn.armeabi
+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
@@ -69,10 +69,11 @@ id.zip
/build-native.sh~
local.properties
+gradle.properties*
*~
*.iml
.idea
build
.gradle
jniLibs
-/app/ovpnlibs/
+bitmask_android/ovpnlibs/