aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sommerseth <dazo@users.sourceforge.net>2010-04-27 23:06:44 +0200
committerDavid Sommerseth <dazo@users.sourceforge.net>2010-04-29 20:21:20 +0200
commitbde80162abcf0ea9f56643b3855f1eccb2eaf10c (patch)
tree9269202e1f5c69b82da68fcc33ae376c16a6e6e9
parentSet socket buffers (SO_SNDBUF and SO_RCVBUF) immediately after (diff)
downloadopenvpn-bde80162abcf0ea9f56643b3855f1eccb2eaf10c.tar.xz
Cleaning up after rebase
-rw-r--r--version.m41
1 files changed, 0 insertions, 1 deletions
diff --git a/version.m4 b/version.m4
index f9c399b..5723d3c 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])