summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-07-22 09:41:27 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2009-07-22 09:41:27 +0200
commit47f1d6d23c344b4c592565cc1ea61b5456570a06 (patch)
tree708ba28ae4b0f028a968e604234b4134c4cc1741 /debian
parent7882ede436f017749d8bd85d1f16506d7c670d1b (diff)
parentd82cdf7391f04a98e5fb954ca23506f7f52435b0 (diff)
merged from the mvo branch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index b379313e4..ff1483dfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -93,7 +93,10 @@ apt (0.7.22) UNRELEASED; urgency=low
- add "showauto" option to show automatically installed packages
* document --install-recommends and --no-install-recommends
(thanks to Dereck Wonnacott, LP: #126180)
-
+ * doc/apt.conf.5.xml:
+ - merged patch from Aurélien Couderc to improve the text
+ (thanks!)
+
[ Julian Andres Klode ]
* apt-pkg/contrib/configuration.cc: Fix a small memory leak in
ReadConfigFile.