diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-18 22:17:58 +0100 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-18 22:17:58 +0100 |
| commit | 529df9922d85574828d95020eebcd228ba3a8164 (patch) | |
| tree | 8524b46dd4bbbd163d4ce273ea6e82edd7c4b947 /ChangeLog | |
| parent | Merge branch 'bugfix2.1' into beta2.2 (diff) | |
| parent | Merged add_bypass_address() and add_host_route_if_nonlocal() (diff) | |
| download | openvpn-529df9922d85574828d95020eebcd228ba3a8164.tar.xz | |
Merge branch 'feat_misc' into beta2.2
Conflicts:
acinclude.m4
config-win32.h
configure.ac
misc.c
thread.c
thread.h
- These conflicts was mainly due to feat_misc getting old
and mostly caused by the pthread clean-up patches in
feat_misc
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions