Merge branch 'master' into xi2

Conflicts:
	src/xinput.h

diff --git a/src/xinput.h b/src/xinput.h
index f3fc26634784bf60076e5f87a3ee5f28d23edaf0..fd468b01530d5c8695aeb79510b40e3479416215 100644 (file)
--- 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);