summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-05-09 09:32:45 +0100
committerColin Watson <cjwatson@debian.org>2013-05-09 09:32:45 +0100
commit2bf02f2429738d820fd98de1078b5265696dbbb5 (patch)
tree5dc37df17c0e03f77b544eb87c0b5de9d6647ed7 /debian/changelog
parent0d6a7068412ff99144c5755d741dee7dd9cd97b2 (diff)
Fix consolekit mismerges in monitor.c and monitor_wrap.c.
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d0f19f9fe..d498fed04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openssh (1:6.2p1-2) UNRELEASED; urgency=low
2 2
3 * Fix build failure on Ubuntu: 3 * Fix build failure on Ubuntu:
4 - Include openbsd-compat/sys-queue.h from consolekit.c. 4 - Include openbsd-compat/sys-queue.h from consolekit.c.
5 - Fix consolekit mismerges in monitor.c and monitor_wrap.c.
5 6
6 -- Colin Watson <cjwatson@debian.org> Thu, 09 May 2013 00:55:50 +0100 7 -- Colin Watson <cjwatson@debian.org> Thu, 09 May 2013 00:55:50 +0100
7 8