|
From: <ope...@li...> - 2011-03-21 20:42:38
|
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, allmerged has been updated
via 4b6315617b09150f85981e761a6cc9c4dc95d68e (commit)
via 58704ea66478942ae82c013d0d48c7931cb79fa0 (commit)
via 4b312378e9e7084a0699ca6d4b895bdadb7540db (commit)
via 110e42d199e735ab1a31388c5678f59d0fa9510c (commit)
via 0c03c731a80399998cc4b03a35ffad2961c7b369 (commit)
via 0265cf3a6b646cc02a78cc3501dce77f99e81a5f (commit)
from 23f732b692b1439f76c7b2658cc67d9a448a6ad4 (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 4b6315617b09150f85981e761a6cc9c4dc95d68e
Merge: 23f732b692b1439f76c7b2658cc67d9a448a6ad4 58704ea66478942ae82c013d0d48c7931cb79fa0
Author: David Sommerseth <da...@re...>
Date: Mon Mar 21 21:42:20 2011 +0100
Merge branch 'beta2.2' into allmerged
-----------------------------------------------------------------------
Summary of changes:
INSTALL-win32.txt | 23 +-
openvpn.8 | 4 +-
service-win32/openvpnserv.c | 4 -
syshead.h | 4 -
tap-win32/SOURCES.in | 3 +-
win/build.py | 41 ++--
win/build_all.py | 13 +-
config-win32.h => win/config.h.in | 622 +++++++++++++++++++------------------
win/config.py | 37 ++-
win/make_dist.py | 109 ++++---
win/openvpn.nsi | 19 +-
win/settings.in | 15 +-
win/tap_span.py | 14 +-
win/wb.py | 59 ++--
14 files changed, 516 insertions(+), 451 deletions(-)
rename config-win32.h => win/config.h.in (90%)
hooks/post-receive
--
OpenVPN with experimental and new features - which requires a lot of testing
|