Merge

diff --git a/ChangeLog b/ChangeLog
index 8e243d9841753917f3caf94c4870ffbfbb3b5991..0ba34231eb6a550b67386f0674a2e17ea2e249c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
-
+1.0 
 * Dropped libmemcached/memcached_util.h (undocumented header file)
+* Added memcached_touch() and memcached_touch_by_key()
+* UDP support restructured to toggle on a complete memcached_st structure.
 
 0.53 Mon Sep 26 20:50:33 PDT 2011
   * Fix for FreeBSD/OpenBSD and -lm

diff --git a/configure.ac b/configure.ac
index ed9b978cc45bb7358a5613c069374d730f1d08df..f4b153b52ac9cc839e677138d5ede6236db401c2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libmemcached],[0.53],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0],[http://libmemcached.org/])
 
 AC_CONFIG_AUX_DIR(config)