From:  <brian@gir.tangent.org>
Date: Mon, 21 Jan 2008 04:36:03 +0000 (-0800)
Subject: Merge.
X-Git-Tag: 0.14~4^2~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=74b5061e4b97edfed3b58f94bd594321e9ae425a;p=m6w6%2Flibmemcached

Merge.
---

74b5061e4b97edfed3b58f94bd594321e9ae425a
diff --cc lib/memcached_version.c
index 7cb65e56,f4a04d7d..e49d76f0
--- a/lib/memcached_version.c
+++ b/lib/memcached_version.c
@@@ -1,5 -1,9 +1,10 @@@
  #include "common.h"
  
 -const char * memcached_lib_version(void) {
++const char * memcached_lib_version(void) 
++{
+   return LIBMEMCACHED_VERSION_STRING;
+ }
+ 
  memcached_return memcached_version(memcached_st *ptr)
  {
    unsigned int x;