]> git.decadent.org.uk Git - nfs-utils.git/commitdiff
projects / nfs-utils.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fcb78d 2d1b9c2)
Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:38:03 +0000 (02:38 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:38:03 +0000 (02:38 +0100)
Conflicts:
configure

1  2 
utils/exportfs/exports.man patch | diff1 | diff2 | blob | history

diff --cc utils/exportfs/exports.man
Simple merge
Debian package of nfs-utils