From: Brian Aker <brian@tangent.org>
Date: Tue, 23 Apr 2013 08:03:33 +0000 (-0400)
Subject: Cut down on merge conflicts.
X-Git-Tag: 1.0.18~25^2~8^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=fae7e491f6b2cb9e07aaca5739e13b26e0022e3b;p=m6w6%2Flibmemcached

Cut down on merge conflicts.
---

diff --git a/ChangeLog b/ChangeLog
index 4d20c93c..5fbed160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+1.0.18
+
 1.0.17 Tue Apr  2 14:02:01 HST 2013
 * Remove c++ namespace that was being exposed (the API should be plug compatible)..
 * Fix cases where --servers wasn't behaving the same in all clients.
diff --git a/configure.ac b/configure.ac
index a81827a2..45ee0e7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,8 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libmemcached],[1.0.17],[http://libmemcached.org/])
+m4_include([version.m4])
+AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/version.m4 b/version.m4
new file mode 100644
index 00000000..759ba247
--- /dev/null
+++ b/version.m4
@@ -0,0 +1 @@
+m4_define([VERSION_NUMBER], [1.0.18])