summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorcyBerta <richy@cyborgsociety.org>2013-11-30 00:56:28 +0100
committercyBerta <richy@cyborgsociety.org>2013-11-30 00:56:28 +0100
commit8462f8a65eacbc47d8e63db058584bed0898e279 (patch)
tree7df2795d04ac8550d1e6907d5efa4c75c5fb07d3 /.gitignore
parentecd01db4ca5c0000d671e888ebdf97c3fdbd51cc (diff)
parent6bf1c8ccbf83defb44e279ed4236e9538c3a09ba (diff)
Merge branch 'feature/tests-0.2.1' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 9aa5a039..9773f598 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ obj
bin
gen
libs
+.settings
openvpn/.git
openvpn/autom4te.cache
openvpn/aclocal.m4