summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-15 08:44:02 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-15 08:44:02 +0000
commit8bc93d7ffbc127e0b095c7274a68eb0c175f93ae (patch)
treebe0d71b15492041caeb3deb1ac923123a44ea96e /ChangeLog
parente9c5e1708139d62865db1c468b2a9fc8339b2f26 (diff)
downloadopenvpn-8bc93d7ffbc127e0b095c7274a68eb0c175f93ae.tar.gz
openvpn-8bc93d7ffbc127e0b095c7274a68eb0c175f93ae.tar.xz
openvpn-8bc93d7ffbc127e0b095c7274a68eb0c175f93ae.zip
svn merge -r 618:619 $SO/patches/openvpn-2-0_rc16-mh/openvpn
Merged --multihome patch + aggregated sockflags. Pre-2.1_beta3 git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@622 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 5 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 5bbdca1..04c8567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,12 +11,11 @@ $Id$
from the file specified by --ca regardless if the pkcs12 file
contains a CA cert or not (Mathias Sundman).
* Merged --capath patch (Thomas Noel).
-* NOTE TO PACKAGE MAINTAINERS: Moved "plugin"
- directory to "plugins". This is
- to work around a strange problem with the
- "make dist" target in the automake-generated
- makefile, where the target tries to do a
- rather bogus "gcc -g -O2 -I. plugin.c -o plugin".
+* Merged --multihome patch.
+* NOTE TO PACKAGE MAINTAINERS: Moved "plugin" directory to "plugins".
+ This is to work around a strange problem with the "make dist"
+ target in the automake-generated makefile, where the target tries to
+ do a rather bogus "gcc -g -O2 -I. plugin.c -o plugin".
2005.10.13 -- Version 2.1-beta2