Menu
▾
▴
[Openvpn-commits] SF.net Git: OpenVPN with experimental and new features - which requires a lot of testing branch, beta2.2, updated. 529df9922d85574828d95020eebcd228ba3a8164
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenVPN with experimental and new features - which requires a lot of testing".
The branch, beta2.2 has been updated
via 529df9922d85574828d95020eebcd228ba3a8164 (commit)
via eb208d36d466a1725e20e0a7aef39b1114b99e78 (commit)
via f20c2f0d6b42f652f39c0082237c3f8d69752ec9 (commit)
via 7c18c6353904f8c6e7f4eab3d13c985761ab80e5 (commit)
via 7581c8fd6f0b0f0855b8dae8dba697fecb5ac6a4 (commit)
via d29e6de16ad1cbbc5740e732268da9347b370a1d (commit)
via 33ee747fff4acb4ea4c143089aa2c596a1e4d0bd (commit)
via eabb8eed0bc3b2b16722eeb38d8000eda35668a7 (commit)
via 2ff54d66a22402caf08709ec22730e20c193ecbd (commit)
via e98124dfbabfa78e9bf6e841ffcc8e04868df331 (commit)
via 2d12eb12cf2a49adbc2e89e20990415947519900 (commit)
via b2dee7d568d4f31e2c2c8aba5de5ac02147c6b6b (commit)
via 6af422162fbc1c505526157ecf630e37694dbc7b (commit)
via cc88a2695f4a54e27143efeae62de24fec8e26a1 (commit)
via 7aa6c12a4424d00ea0add0a849f8a5b31a2de6a1 (commit)
from 4b519cf51d02daacb388eb90bd0c5930145d7a0d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 529df9922d85574828d95020eebcd228ba3a8164
Merge: eb208d36d466a1725e20e0a7aef39b1114b99e78 7c18c6353904f8c6e7f4eab3d13c985761ab80e5
Author: David Sommerseth <da...@us...>
Date: Thu Nov 18 22:17:58 2010 +0100
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 <da...@us...>
commit eb208d36d466a1725e20e0a7aef39b1114b99e78
Merge: 4b519cf51d02daacb388eb90bd0c5930145d7a0d f20c2f0d6b42f652f39c0082237c3f8d69752ec9
Author: David Sommerseth <da...@us...>
Date: Thu Nov 18 19:10:08 2010 +0100
Merge branch 'bugfix2.1' into beta2.2
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 -
acinclude.m4 | 224 ---------------------------------------------------
buffer.c | 5 -
buffer.h | 1 -
configure.ac | 38 +---------
crypto.c | 3 -
cryptoapi.c | 2 +
error.c | 39 ---------
error.h | 17 ----
forward.c | 10 ---
ieproxy.c | 3 +-
init.c | 50 ------------
list.c | 24 +-----
list.h | 33 +-------
mbuf.c | 16 +---
mbuf.h | 3 +-
misc.c | 23 -----
mroute.c | 6 --
mroute.h | 13 ---
mtcp.c | 5 +-
mudp.c | 3 -
multi.c | 32 +++-----
multi.h | 2 -
openvpn.h | 3 -
options.c | 38 +--------
options.h | 5 -
otime.c | 2 -
otime.h | 1 -
perf.c | 6 +-
pf.c | 2 +-
pkcs11.c | 2 +
plugin.c | 4 -
pool.h | 1 -
ps.c | 12 ---
reliable.c | 2 +
route.c | 34 +++-----
schedule.c | 4 -
schedule.h | 8 --
sig.c | 9 --
socket.c | 7 --
socks.c | 13 +++-
ssl.c | 9 +--
ssl.h | 4 -
syshead.h | 18 ----
thread.c | 156 ------------------------------------
thread.h | 235 ------------------------------------------------------
win/build_all.py | 71 +++++++++++++----
47 files changed, 118 insertions(+), 1081 deletions(-)
delete mode 100644 thread.c
delete mode 100644 thread.h
hooks/post-receive
--
OpenVPN with experimental and new features - which requires a lot of testing
|
