From 5719b20f6566d6df13010c106630e8448384d688 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 30 May 2011 11:42:37 +0200 Subject: Solved merge problem --- xorg-server/hw/xwin/winmouse.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'xorg-server/hw') diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c index 6d2e43f07..efe71103c 100644 --- a/xorg-server/hw/xwin/winmouse.c +++ b/xorg-server/hw/xwin/winmouse.c @@ -250,12 +250,7 @@ winMouseButtonsSendEvent (int iEventType, int iButton) QueuePointerEvents(g_pwinPointer, iEventType, iButton, POINTER_RELATIVE, &mask); -#if CYGDEBUG - ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d, nEvents %d\n", - iEventType, iButton, nevents); winDebug("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n", -#if CYGDEBUG - ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n", iEventType, iButton); } -- cgit v1.2.3