]> err.no Git - dpkg/commit
Merge branch 'master' into dpkg-shlibdeps-buxy
authorFrank Lichtenheld <djpig@debian.org>
Sat, 22 Sep 2007 16:36:11 +0000 (18:36 +0200)
committerFrank Lichtenheld <djpig@debian.org>
Sat, 22 Sep 2007 16:36:11 +0000 (18:36 +0200)
commit85637101b5df1ce82c845f55949c7ba607763716
treed7fa3d1c3041d00a668ca92ea8dc1bf4c969ad7e
parent61ad4f1bc2ffd18706dea3b3226dd6f57bbce625
parentca39b2a4cc4b32422453d27030ab86930f51cd4d
Merge branch 'master' into dpkg-shlibdeps-buxy

Conflicts:

scripts/dpkg-shlibdeps.pl
configure.ac
man/Makefile.am
scripts/Makefile.am
scripts/dpkg-shlibdeps.pl