diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
| commit | 38d2959ffb8c6f5f291b2910014a67b1b352ab4c (patch) | |
| tree | c5977b8f34aaf973ed3956952ec3ff43ac59f143 /methods/copy.cc | |
| parent | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (diff) | |
| parent | 3fa4e98f62e469f4292d2811b4e15f4afb678fbd (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/cachefilter.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/netrc.h
apt-pkg/deb/debsrcrecords.cc
apt-pkg/init.h
apt-pkg/pkgcache.cc
debian/apt.install.in
debian/changelog
Diffstat (limited to 'methods/copy.cc')
| -rw-r--r-- | methods/copy.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/methods/copy.cc b/methods/copy.cc index f2a8f9ed8..d59f032ff 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -17,9 +17,10 @@ #include <apt-pkg/error.h> #include <apt-pkg/hashes.h> +#include <string> #include <sys/stat.h> #include <sys/time.h> -#include <unistd.h> + #include <apti18n.h> /*}}}*/ |