summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-11-22 11:57:00 +0100
committerParménides GV <parmegv@sdf.org>2013-11-22 11:57:00 +0100
commit836cf5c9a0e2d33f205c3c353e1300ee1ad03b5b (patch)
tree69034f031f4ef98cc48e4d3cc0e24775d34d4aca /.gitignore
parentecd01db4ca5c0000d671e888ebdf97c3fdbd51cc (diff)
Rebased onto 0.2.2
Some tests aren't passed, due to changes and UI (for example, log in dialog is no longer a menu item but an action bar item, and robotium can't find it).
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