diff options
author | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 14:20:27 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 14:20:27 +0200 |
commit | c511c5e8ed3f59ddee1b174b39e5cc16a2f11922 (patch) | |
tree | 732e4b2ff090c01bb07dedeefe25cd517070c256 /apt-private/private-utils.h | |
parent | 8c782efd93342c6119e8ba2ff6989b7a164b7f3d (diff) | |
parent | d916e2a93b798e29d342e9498266767c5be8e2a5 (diff) |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
apt-pkg/cachefilter.h
configure.ac
debian/changelog
Diffstat (limited to 'apt-private/private-utils.h')
-rw-r--r-- | apt-private/private-utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-private/private-utils.h b/apt-private/private-utils.h index 432699787..8ba480bd4 100644 --- a/apt-private/private-utils.h +++ b/apt-private/private-utils.h @@ -5,7 +5,7 @@ #include <string> -APT_PUBLIC void DisplayFileInPager(std::string filename); -APT_PUBLIC void EditFileInSensibleEditor(std::string filename); +APT_PUBLIC void DisplayFileInPager(std::string const &filename); +APT_PUBLIC void EditFileInSensibleEditor(std::string const &filename); #endif |