]> git.ipfire.org Git - thirdparty/openvpn.git/commit
projects / thirdparty / openvpn.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 20b18fd) | patch
Solved hidden merge conflicts between master and svn-branch-2.1
authorDavid Sommerseth <dazo@users.sourceforge.net>
Tue, 26 Apr 2011 21:27:12 +0000 (23:27 +0200)
committerDavid Sommerseth <dazo@users.sourceforge.net>
Tue, 26 Apr 2011 21:27:12 +0000 (23:27 +0200)
commit0b6450c93f9efb51ac089dbe0a43b139bc0b89bd
tree67a4f011b64273e1cba774041654f6ffa84855dftree
parent20b18fd799e2ea9d0651f3ef913dd9ce2e481471commit | diff
Solved hidden merge conflicts between master and svn-branch-2.1

ps.c - The feat_ipv6_transport patch set modifies struct openvpn_sockaddr by
       adding a union named 'addr' in commit 8335caf929f21b31.

ssl.c - A needed } and #endif had been dropped by a mistake

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
ps.c diff | blob | blame | history
ssl.c diff | blob | blame | history
Mirror of https://github.com/OpenVPN/openvpn.git