]> err.no Git - dpkg/commit
Merge branch 'controllib-removal'
authorRaphael Hertzog <hertzog@debian.org>
Tue, 8 Jan 2008 08:04:39 +0000 (09:04 +0100)
committerRaphael Hertzog <hertzog@debian.org>
Tue, 8 Jan 2008 08:04:39 +0000 (09:04 +0100)
commit1b5580ade0807f1a873773222ea0a7e85f5b23ca
tree2fc934006eabe8a4d14b0af336f32303b42cd333
parent2006f645b0e4510871a9c69f37a2b25b6a1e19be
parent2ddc84d8d20490a862b0204ef054e615f3f648f4
Merge branch 'controllib-removal'

Conflicts:

ChangeLog
scripts/dpkg-buildpackage.pl
scripts/dpkg-checkbuilddeps.pl
ChangeLog
debian/changelog
scripts/dpkg-buildpackage.pl
scripts/dpkg-checkbuilddeps.pl
scripts/dpkg-genchanges.pl
scripts/dpkg-shlibdeps.pl
scripts/dpkg-source.pl