diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-26 23:27:12 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-26 23:27:12 +0200 |
| commit | 0b6450c93f9efb51ac089dbe0a43b139bc0b89bd (patch) | |
| tree | 67a4f011b64273e1cba774041654f6ffa84855df /socket.c | |
| parent | Merge branch 'svn-branch-2.1' into merge (diff) | |
| download | openvpn-0b6450c93f9efb51ac089dbe0a43b139bc0b89bd.tar.xz | |
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>
Diffstat (limited to 'socket.c')
0 files changed, 0 insertions, 0 deletions