diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-29 12:14:42 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-29 12:14:42 +0200 |
| commit | 1f46d14620a0b58a9239fa3faa59ba79a98f6c98 (patch) | |
| tree | fd096e59115c48d15f27b1ae7376caf5ce2929dc /cmdline | |
| parent | e110d7bf5675f484c06b82f621ac98bedc464865 (diff) | |
| parent | 55ef358b06854768cea247870e1d2f28a5955b90 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/experimental
Conflicts:
test/integration/test-bug-747261-arch-specific-conflicts
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-get.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 3388351d9..1943a0fa7 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -76,7 +76,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/ioctl.h> #include <sys/stat.h> #include <sys/statfs.h> #include <sys/statvfs.h> |