diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-10-07 16:38:03 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-07 16:38:03 +0200 |
| commit | 4d0818cc39f7c0d44ecdfcdf9701058f81caa492 (patch) | |
| tree | 63eaa546ba527209d2b2068d188800e5e4872093 /apt-pkg/install-progress.cc | |
| parent | ea7682a0d91fee638eef06b63045b1499ddf50ac (diff) | |
| parent | 00a06b8eb82cf930511fc003bd16d7034e5a0cb5 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Conflicts:
apt-pkg/acquire-item.cc
Diffstat (limited to 'apt-pkg/install-progress.cc')
| -rw-r--r-- | apt-pkg/install-progress.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc index 0d180d59b..5ea8bf4d0 100644 --- a/apt-pkg/install-progress.cc +++ b/apt-pkg/install-progress.cc @@ -21,8 +21,8 @@ namespace APT { namespace Progress { -PackageManager::PackageManager() : d(NULL), percentage(0.0), last_reported_progress(-1) {}; -PackageManager::~PackageManager() {}; +PackageManager::PackageManager() : d(NULL), percentage(0.0), last_reported_progress(-1) {} +PackageManager::~PackageManager() {} /* Return a APT::Progress::PackageManager based on the global * apt configuration (i.e. APT::Status-Fd and APT::Status-deb822-Fd) |