From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 8 May 2009 05:15:45 +0000 (+1000)
Subject: Merge branch 'master' into xi2
X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/9c6a51e8aaba50b8f3a0f3ad767c34a80aee55a1?hp=239cd6a673be2821915301c1b3c3bae063e9dd94

Merge branch 'master' into xi2

Conflicts:
	src/xinput.h
---

diff --git a/src/xinput.h b/src/xinput.h
index f3fc266..fd468b0 100644
--- a/src/xinput.h
+++ b/src/xinput.h
@@ -41,7 +41,6 @@
 #define EXIT_FAILURE 0
 #endif
 
-
 XDeviceInfo* find_device_info( Display *display, char *name, Bool only_extended);
 #if HAVE_XI2
 XIDeviceInfo* xi2_find_device_info(Display *display, char *name);