diff options
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index af75ee757..06520b748 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,4 @@ -<<<<<<< HEAD -apt (0.9.10~exp1) UNRELEASED; urgency=low +apt (0.9.11~exp1) UNRELEASED; urgency=low [ Michael Vogt ] * lp:~mvo/apt/webserver-simulate-broken-with-fix346386: @@ -14,9 +13,10 @@ apt (0.9.10~exp1) UNRELEASED; urgency=low * use sha512 when available (LP: #1098752) * [ABI-Break] lp:~mvo/apt/source-hashes: - use sha{512,256,1} for deb-src when available LP: #1098738 + * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines -- Michael Vogt <mvo@debian.org> Fri, 01 Mar 2013 12:12:39 +0100 -======= + apt (0.9.11) UNRELEASED; urgency=low The "Happy 20th Birthday Debian" upload @@ -48,7 +48,6 @@ apt (0.9.11) UNRELEASED; urgency=low * French translation update. -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Aug 2013 09:27:35 +0200 ->>>>>>> debian/sid apt (0.9.10) unstable; urgency=low |