aboutsummaryrefslogtreecommitdiff
path: root/.svnignore
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-12 12:04:14 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-12 12:04:14 +0000
commit20006b8e622ca4d4ca7dc6f316d9b2d948ca3687 (patch)
treeeb66a23f993a7f556de760789d7a1dd2dc30a483 /.svnignore
parentAdded support for openvpn_plugin_select_initialization_point_v1 (diff)
downloadopenvpn-20006b8e622ca4d4ca7dc6f316d9b2d948ca3687.tar.xz
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
Diffstat (limited to '')
-rw-r--r--.svnignore3
1 files changed, 3 insertions, 0 deletions
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