]> git.saurik.com Git - apt.git/commit - apt-pkg/contrib/fileutl.cc
Merge remote-tracking branch 'mvo/feature/drop-rights' into debian/experimental
authorMichael Vogt <mvo@debian.org>
Wed, 18 Jun 2014 08:47:19 +0000 (10:47 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 18 Jun 2014 08:47:57 +0000 (10:47 +0200)
commit17091f2f33de16c2dae501e7868f7aec4fc3452f
treef3eed549bbcb50a46d7c10aa7c3a048cf7fee166
parentb6fea8bbe25e3c0312de72c99b0d49c699d02b7b
parentfc1a78d8e9b958f3d65fe1c03494d785314f9816
Merge remote-tracking branch 'mvo/feature/drop-rights' into debian/experimental

Conflicts:
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/fileutl.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/fileutl.h