]> git.ipfire.org Git - thirdparty/openvpn.git/commit
projects / thirdparty / openvpn.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dcf4bcc 15a436a)
Merge branch 'feat_ipv6_payload'
authorDavid Sommerseth <dazo@users.sourceforge.net>
Mon, 25 Apr 2011 15:16:34 +0000 (17:16 +0200)
committerDavid Sommerseth <dazo@users.sourceforge.net>
Mon, 25 Apr 2011 15:18:40 +0000 (17:18 +0200)
commitc5f7d08b8c3d4287dd40bbdf52525add8f5cee20
tree0b5c57f614d395ff2033b45437abb48b84db1a8dtree
parentdcf4bcc2d95faac5d7c4844ca841359526601c69commit | diff
parent15a436aac6b617b87bb234cdd7fedf1e603c470fcommit | diff
Merge branch 'feat_ipv6_payload'

Conflicts:
options.c
- feat_ipv6_payload and feat_ip6_transport both updates
      this file with presence information

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
init.c diff1 | diff2 | blob | history
mroute.c diff1 | diff2 | blob | history
multi.c diff1 | diff2 | blob | history
openvpn.8 diff1 | diff2 | blob | history
options.c diff1 | diff2 | blob | history
route.c diff1 | diff2 | blob | history
socket.c diff1 | diff2 | blob | history
socket.h diff1 | diff2 | blob | history
tun.c diff1 | diff2 | blob | history
win32.h diff1 | diff2 | blob | history
Mirror of https://github.com/OpenVPN/openvpn.git