From: Michael Vogt <mvo@debian.org>
Date: Fri, 27 Dec 2013 23:31:01 +0000 (+0100)
Subject: Merge branch 'debian/sid' into bugfix/bts731738-fancy-progess
X-Git-Tag: 0.9.14.2~3^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/35ac30ee373c5ed84d7c2c5a701ac2d54963504d

Merge branch 'debian/sid' into bugfix/bts731738-fancy-progess

Conflicts:
	apt-pkg/install-progress.cc
---

35ac30ee373c5ed84d7c2c5a701ac2d54963504d
diff --cc apt-pkg/install-progress.cc
index 0e093a511,0caf62b61..fe065da4f
--- a/apt-pkg/install-progress.cc
+++ b/apt-pkg/install-progress.cc
@@@ -9,7 -9,7 +9,8 @@@
  #include <sys/ioctl.h>
  #include <sstream>
  #include <fcntl.h>
 +#include <algorithm>
+ #include <stdio.h>
  
  namespace APT {
  namespace Progress {