summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-09-26 10:56:45 +0200
committerParménides GV <parmegv@sdf.org>2014-09-26 10:56:45 +0200
commitd0f652308cf1d8d121c6e3656b0c2726e523bc1f (patch)
treecc84605593cd149aaaa16aaa711c64610970e072 /.gitignore
parente5d9306d5d536d28b617f9dc2e42226e03462c70 (diff)
parent8c4b3edafc68e647bd44ae456c15f0aea9d45905 (diff)
Merge branch 'develop' into release-0.7.0
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index b5067c60..804337f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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