diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-25 17:16:34 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-25 17:18:40 +0200 |
| commit | c5f7d08b8c3d4287dd40bbdf52525add8f5cee20 (patch) | |
| tree | 0b5c57f614d395ff2033b45437abb48b84db1a8d /Makefile.am | |
| parent | dcf4bcc2d95faac5d7c4844ca841359526601c69 (diff) | |
| parent | 15a436aac6b617b87bb234cdd7fedf1e603c470f (diff) | |
| download | openvpn-c5f7d08b8c3d4287dd40bbdf52525add8f5cee20.tar.gz openvpn-c5f7d08b8c3d4287dd40bbdf52525add8f5cee20.tar.xz openvpn-c5f7d08b8c3d4287dd40bbdf52525add8f5cee20.zip | |
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>
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions