err.no Git - dpkg/commit

]> err.no Git - dpkg/commit

projects / dpkg / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a8ada21 7364cd5)

author	Raphael Hertzog <hertzog@debian.org>
	Wed, 18 Jun 2008 08:43:41 +0000 (10:43 +0200)
committer	Raphael Hertzog <hertzog@debian.org>
	Wed, 18 Jun 2008 08:43:41 +0000 (10:43 +0200)
commit	2a71e19cf610bf2a614d0efc261f975332596fc4
tree	20fc55b6863a5b82aef22839d30b8ad60f30b929	tree \| snapshot
parent	a8ada212bde12d7fffc5673b0c9ca397b31e1354	commit \| diff
parent	7364cd5f05a1fd9cc14534848e846db956d6eb0c	commit \| diff

Merge lenny branch (through the tag '1.14.20')

Conflicts:

ChangeLog
configure.ac
debian/changelog
man/ChangeLog
man/dpkg.1
man/po/de.po

ChangeLog	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
man/ChangeLog	diff1 \|	diff2 \|	blob \| history
man/dpkg-source.1	diff1 \|	diff2 \|	blob \| history
man/dpkg.1	diff1 \|	diff2 \|	blob \| history
man/po/de.po	diff1 \|	diff2 \|	blob \| history
po/pt.po	diff1 \|	diff2 \|	blob \| history
scripts/Dpkg/Source/Package.pm	diff1 \|	diff2 \|	blob \| history
scripts/update-alternatives.pl	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history

dpkg, the Debian package manager