diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-12 08:36:58 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-12 08:36:58 +0200 |
| commit | cfc7f735774ba30dbee1897248f8dfedf0229a4c (patch) | |
| tree | b4e0ac29a6b398045a803e890f5cdabcca189d6a /apt-pkg/vendorlist.h | |
| parent | a0187f0f82a184b850b05b62e5a59b6a2055a506 (diff) | |
| parent | 7701680af12a2c1a65121533c6ebcd635c013c25 (diff) | |
Merge tag '1.0.1ubuntu2' into ubuntu/trusty
Conflicts:
configure.ac
debian/changelog
debian/control
test/integration/framework
Diffstat (limited to 'apt-pkg/vendorlist.h')
| -rw-r--r-- | apt-pkg/vendorlist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h index a86ccde7c..bc3702a93 100644 --- a/apt-pkg/vendorlist.h +++ b/apt-pkg/vendorlist.h @@ -27,7 +27,7 @@ using std::vector; class Vendor; class Configuration; -class __deprecated pkgVendorList +class APT_DEPRECATED pkgVendorList { protected: std::vector<Vendor const *> VendorList; |