summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-04-09 17:07:48 +0200
committerParménides GV <parmegv@sdf.org>2014-04-09 17:15:17 +0200
commit51ff5a18f1f074e27e97d822745551a7e8fa068d (patch)
tree402e7dd42778a218635bb29a4c2dff93ea7f6525 /.gitignore
parent910b0e1746ab3f63e63808b198ad51fec5b635e5 (diff)
parentb5ba0abc1610dd4bf573ebcabc5e8f6ab0c9528f (diff)
Merge branch 'feature/implement-gradle-build-system-#4676' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore18
1 files changed, 12 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 338aab70..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
-assets/minivpn.armeabi
-assets/minivpn.armeabi-v7a
-assets/minivpn.mips
-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
@@ -68,6 +68,12 @@ id.zip
/build-native.sh.bk
/build-native.sh~
-build.gradle
local.properties
-*.java~
+gradle.properties*
+*~
+*.iml
+.idea
+build
+.gradle
+jniLibs
+bitmask_android/ovpnlibs/