From c89414179f77982751064a5709122913c3ffd6c4 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sat, 9 Feb 2013 17:03:27 +0100
Subject: Merge non OpenVPN3 specific into main

---
 .hgignore | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.hgignore')

diff --git a/.hgignore b/.hgignore
index 7a6193b8..e6d2de68 100644
--- a/.hgignore
+++ b/.hgignore
@@ -24,7 +24,7 @@ openvpn/build/msvc/Makefile.in
 openvpn/src/openvpn/.deps
 openvpn/src/compat/.deps
 *.o
-
+ovpn3
 *.patch
 openvpn/distro/Makefile.in
 openvpn/distro/rpm/Makefile.in
@@ -62,4 +62,5 @@ ics-openvpn.zip
 zh-CN.zip
 zh-TW.zip
 google-breakpad/
-id.zip
\ No newline at end of file
+id.zip
+ovpn3/boost
\ No newline at end of file
-- 
cgit v1.2.3