From: David Sommerseth Date: Tue, 27 Apr 2010 21:06:44 +0000 (+0200) Subject: Cleaning up after rebase X-Git-Tag: v2.2-beta1~7^2~4^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ffa93d36d92279a45566c43b9181db7cd7ca524;p=thirdparty%2Fopenvpn.git Cleaning up after rebase --- diff --git a/version.m4 b/version.m4 index f9c399b77..5723d3c50 100644 --- a/version.m4 +++ b/version.m4 @@ -1,6 +1,5 @@ dnl define the OpenVPN version define(PRODUCT_VERSION,[2.1.1g]) ->>>>>>> Set socket buffers (SO_SNDBUF and SO_RCVBUF) immediately after dnl define the TAP version define(PRODUCT_TAP_ID,[tap0901]) define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])