]> git.ipfire.org Git - thirdparty/openvpn.git/commit
projects / thirdparty / openvpn.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 61c4064 f0eac1a)
Merge branch 'feat_misc' into beta2.2
authorDavid Sommerseth <dazo@users.sourceforge.net>
Fri, 12 Nov 2010 23:55:02 +0000 (00:55 +0100)
committerDavid Sommerseth <dazo@users.sourceforge.net>
Fri, 12 Nov 2010 23:55:02 +0000 (00:55 +0100)
commit1aa664cef51e4b4ed4b35e569925acb4fd7b9b52
tree616d3705094f7a68ddc7c3929b8a9c0afc20509atree
parent61c40649de994c8f2ce713389294134aeb6cc8a7commit | diff
parentf0eac1a5979096c671b3674f9d80871f496d1da8commit | diff
Merge branch 'feat_misc' into beta2.2

Conflicts:
Makefile.am
openvpn.8
options.c
socket.c
ssl.c
- feat_misc is missing a lot of bugfix2.1 changes

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