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 /otime.h | |
parent | eb208d36d466a1725e20e0a7aef39b1114b99e78 (diff) | |
parent | 7c18c6353904f8c6e7f4eab3d13c985761ab80e5 (diff) | |
download | openvpn-529df9922d85574828d95020eebcd228ba3a8164.tar.gz openvpn-529df9922d85574828d95020eebcd228ba3a8164.tar.xz openvpn-529df9922d85574828d95020eebcd228ba3a8164.zip |
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 'otime.h')
-rw-r--r-- | otime.h | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -28,7 +28,6 @@ #include "common.h" #include "integer.h" #include "buffer.h" -#include "thread.h" struct frequency_limit { |