diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 15:47:44 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 15:47:44 +0200 |
| commit | db1d1c32149177c0b6ca49e5107ab1f5fd364660 (patch) | |
| tree | b06b22a9c92455b32889c88407f4190113a5cdd9 /apt-private/private-output.h | |
| parent | 916b89109cd77728004819d4705778e3dc489b2e (diff) | |
| parent | c511c5e8ed3f59ddee1b174b39e5cc16a2f11922 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
methods/copy.cc
test/integration/test-hashsum-verification
Diffstat (limited to 'apt-private/private-output.h')
| -rw-r--r-- | apt-private/private-output.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-private/private-output.h b/apt-private/private-output.h index 6f3a964d7..e0dc9bf62 100644 --- a/apt-private/private-output.h +++ b/apt-private/private-output.h @@ -23,8 +23,8 @@ APT_PUBLIC extern unsigned int ScreenWidth; APT_PUBLIC bool InitOutput(); void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, - pkgCache::VerIterator V, std::ostream &out, - bool include_summary=true); + pkgCache::VerIterator const &V, std::ostream &out, + std::string const &format); // helper to describe global state |