svn merge -r 582:585 $SO/trunk/openvpn

2.1_beta1

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@586 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/.svnignore b/.svnignore
new file mode 100644 (file)
index 0000000..8fb8204
--- /dev/null
+++ b/.svnignore
@@ -0,0 +1,32 @@
+*.conf
+*.log
+*.patch
+*.diff
+*.tmp
+tmp*
+log*
+files
+pid
+ipp.txt
+config.m4
+version
+openvpn
+config.cache
+configure
+Makefile
+Makefile.in
+stamp-h*
+config.guess
+config.sub
+depcomp
+missing
+mkinstalldirs
+config.status
+config.h
+config.h.in
+aclocal.m4
+openvpn.spec
+config-win32.h
+install-sh
+autom4te*.cache
+.deps

diff --git a/install-win32/.svnignore b/install-win32/.svnignore
new file mode 100644 (file)
index 0000000..f3e2006
--- /dev/null
+++ b/install-win32/.svnignore
@@ -0,0 +1 @@
+openvpn.nsi