diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-13 00:48:28 +0100 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-13 00:48:28 +0100 |
| commit | 8367889e8467ce73b051aa8db64b0336aea8ed4b (patch) | |
| tree | 99578b1e6969d7eeb19b2578137c1c92de2fc49b /version.m4 | |
| parent | 0bb41e58782ae9834a61491c5964bc9816b76bc8 (diff) | |
| parent | 20a4c12783144d798c6b7446bae8920fdfea7adc (diff) | |
| download | openvpn-8367889e8467ce73b051aa8db64b0336aea8ed4b.tar.gz openvpn-8367889e8467ce73b051aa8db64b0336aea8ed4b.tar.xz openvpn-8367889e8467ce73b051aa8db64b0336aea8ed4b.zip | |
Merge branch 'svn-BETA21' into beta2.2
Conflicts:
version.m4
- Reset version.m4 to a more neutral version number
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'version.m4')
| -rw-r--r-- | version.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ dnl define the OpenVPN version -define(PRODUCT_VERSION,[2.2-beta3]) +define(PRODUCT_VERSION,[2.2-beta]) dnl define the TAP version define(PRODUCT_TAP_ID,[tap0901]) define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9]) |