diff options
author | Michael Vogt <mvo@debian.org> | 2013-12-07 17:54:11 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-12-07 17:54:11 +0100 |
commit | 8fafb8adc032002284f53359e1308efa609f9239 (patch) | |
tree | 2348ae1953446a069c0e44bcd20915c22c4d89b1 /apt-pkg/deb/dpkgpm.h | |
parent | bc435af429f427c6a5db971c3d4cc7f15a2fe55d (diff) | |
parent | ce34af08ad6866869147e3525fa6c89d8dcb4601 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
debian/gbp.conf
Diffstat (limited to 'apt-pkg/deb/dpkgpm.h')
-rw-r--r-- | apt-pkg/deb/dpkgpm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 06318d94f..02e12a6d9 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -89,7 +89,6 @@ class pkgDPkgPM : public pkgPackageManager const std::string &short_pkgname); // Terminal progress - void SetupTerminalScrollArea(int nr_scrolled_rows); void SendTerminalProgress(float percentage); // apport integration |