From 20006b8e622ca4d4ca7dc6f316d9b2d948ca3687 Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Wed, 12 Oct 2005 12:04:14 +0000
Subject: svn merge -r 585:599 https://svn.openvpn.net/projects/openvpn/trunk
 2.1_beta1

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@600 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 .svnignore | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.svnignore')

diff --git a/.svnignore b/.svnignore
index 8805c21..31da1e9 100644
--- a/.svnignore
+++ b/.svnignore
@@ -35,3 +35,6 @@ autom4te*.cache
 *.asc
 *.zip
 *.so
+*.merge-left.*
+*.merge-right.*
+*.working
-- 
cgit