[Fakeroot-commits] [SCM] fakeroot branch, master, updated. debian/1.14.3-175-g3553496

Clint Adams clint at debian.org
Mon Mar 28 15:17:19 UTC 2011


The following commit has been merged in the master branch:
commit 0de717375d2371b49df88740d487924033a481b2
Merge: dcd8e578f315f33f101a4a466ecb6175b13b1720 613c477413960c2d7bb30e54a600c9ae48ce2d58
Author: Clint Adams <clint at debian.org>
Date:   Mon Mar 28 11:09:54 2011 -0400

    Merge branch 'upstream'
    
    Conflicts:
    	configure.ac
    	doc/faked.1
    	doc/fakeroot.1
    	doc/po4a/po/es.po
    	doc/po4a/po/fakeroot.pot
    	doc/po4a/po/fr.po
    	doc/po4a/po/nl.po
    	doc/po4a/po/sv.po
    	libfakeroot.c
    	wrapfunc.inp


-- 
fakeroot



More information about the Fakeroot-commits mailing list