summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-11-29 20:48:54 +0100
committerMichael Vogt <mvo@debian.org>2013-11-29 20:48:54 +0100
commit2cd3c6b82a67995d25a6bdbc78d351c3170ed1f0 (patch)
tree4d0700bbca5db1ac448134f3d057e08293073936 /debian/changelog
parentec980be7637b735aa91d7091dae6e18b150cb724 (diff)
parent0cd4e696306af28f98c0f810ed18b052919205c8 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 45ee59a51..bdac15350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ apt (0.9.13.1~ubuntu2) UNRELEASED; urgency=low
* merge mvo/feature/edit-sources
* fix segfault in pkgDepCache::SetCandidateRelease() (closes: #709560)
* reset terminal on error (closes: #730795)
+ * merge mvo/feature/edit-sources
+ * fix segfault in pkgDepCache::SetCandidateRelease() (closes: #709560)
+ * reset terminal on error (closes: #730795)
+ * fix apport report writing (LP: #1254499)
-- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Nov 2013 14:37:36 +0100