From 836cf5c9a0e2d33f205c3c353e1300ee1ad03b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 22 Nov 2013 11:57:00 +0100
Subject: 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).
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

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
-- 
cgit v1.2.3