[libmicrohttpd: 12/12] Merge branch 'master' into f13

Tim Niemueller timn at fedoraproject.org
Tue Jan 25 00:06:39 UTC 2011


commit 45d789b79af00648de488e54a16c56d8f3d63560
Merge: f4604f9 920b0bb
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Tue Jan 25 01:05:47 2011 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	libmicrohttpd.spec
    	sources

 .gitignore                               |    5 ++-
 libmicrohttpd-0.9.5-fix-basic-auth.patch |   19 ++++++++
 libmicrohttpd-0.9.5-no-abort.patch       |   12 +++++
 libmicrohttpd.spec                       |   70 ++++++++++++++++++++++--------
 libmicrohttpd_64bit_fix.patch            |   11 -----
 sources                                  |    2 +-
 6 files changed, 88 insertions(+), 31 deletions(-)
---


More information about the scm-commits mailing list