]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
projects / thirdparty / openvpn.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1aa664c 5682d33)
Merge branch 'feat_misc' into beta2.2
authorDavid Sommerseth <dazo@users.sourceforge.net>
Sun, 14 Nov 2010 11:42:38 +0000 (12:42 +0100)
committerDavid Sommerseth <dazo@users.sourceforge.net>
Sun, 14 Nov 2010 11:42:38 +0000 (12:42 +0100)
1  2 
options.c patch | diff1 | diff2 | blob | history

diff --cc options.c
Simple merge
Mirror of https://github.com/OpenVPN/openvpn.git