]> err.no Git - dpkg/commitdiff
projects / dpkg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4a633c b7c2a34)
Merge commit 'err.no/master' master
authorTollef Fog Heen <tfheen@err.no>
Mon, 10 Mar 2008 17:00:44 +0000 (18:00 +0100)
committerTollef Fog Heen <tfheen@err.no>
Mon, 10 Mar 2008 17:00:44 +0000 (18:00 +0100)
Conflicts:

src/archives.c


Trivial merge
dpkg, the Debian package manager