From: Miklos Szeredi <mszeredi@suse.cz>
Date: Mon, 13 Aug 2012 10:59:29 +0000 (+0200)
Subject: Merge branch 'fuse_2_9_bugfix'
X-Git-Tag: fuse-3.0.0pre0~160
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5957ea2fd952cc7158f5632655d706abfa789e95;p=qemu-gpiodev%2Flibfuse.git

Merge branch 'fuse_2_9_bugfix'
---

5957ea2fd952cc7158f5632655d706abfa789e95
diff --cc ChangeLog
index 5eeb9fe,4660598..f2582bc
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
+ 2012-08-13  Miklos Szeredi <miklos@szeredi.hu>
+ 
+ 	* Fix linking against GNU libiconv.  Patch by Natanael Copa
+ 
 +2012-07-19  Miklos Szeredi <miklos@szeredi.hu>
 +
 +	* Start of 3.0 series.  This is going to be a new major version of
 +	the library breaking backward compatibility on the binary level as
 +	well as the source level.
 +
  2012-07-19  Miklos Szeredi <miklos@szeredi.hu>
  
  	* Released 2.9.1