From 2bf02f2429738d820fd98de1078b5265696dbbb5 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 9 May 2013 09:32:45 +0100 Subject: Fix consolekit mismerges in monitor.c and monitor_wrap.c. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') 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 * Fix build failure on Ubuntu: - Include openbsd-compat/sys-queue.h from consolekit.c. + - Fix consolekit mismerges in monitor.c and monitor_wrap.c. -- Colin Watson Thu, 09 May 2013 00:55:50 +0100 -- cgit v1.2.3