From: Miklos Szeredi <mszeredi@suse.cz>
Date: Fri, 14 Aug 2015 04:51:59 +0000 (+0200)
Subject: Merge git://git.code.sf.net/u/xophmeister/fuse
X-Git-Tag: fuse-3.0.0pre0~71
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4ae8680e40b60d65029f4630c21ab182d3c79e8e;p=qemu-gpiodev%2Flibfuse.git

Merge git://git.code.sf.net/u/xophmeister/fuse
---

4ae8680e40b60d65029f4630c21ab182d3c79e8e
diff --cc ChangeLog
index a0c2419,4c0d87d..5b39f16
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,11 @@@
  2015-08-12  Miklos Szeredi <miklos@szeredi.hu>
  
 +	* libfuse: fix warning mount.c:receive_fd().  Reported by Albert
 +	Berger
 +
+ 	* libfuse: added fuse_pkgversion() function to retrieve the full
+ 	version string, per autoconf.  Patch by Christopher Harrison
+ 
  2015-06-29  Miklos Szeredi <miklos@szeredi.hu>
  
  	* libfuse: fix possible memory leak.  Reported by Jose R. Guzman