diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-08 15:15:45 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-08 15:15:45 +1000 |
| commit | 9c6a51e8aaba50b8f3a0f3ad767c34a80aee55a1 (patch) | |
| tree | 7028e3b1a5573b2dcf9b6aacc6759e02f6dd710e /src/xinput.h | |
| parent | 239cd6a673be2821915301c1b3c3bae063e9dd94 (diff) | |
| parent | 4832dc1f3ee8d11eadc99b5cd4e8158773d11f9b (diff) | |
Merge branch 'master' into xi2
Conflicts:
src/xinput.h
Diffstat (limited to 'src/xinput.h')
| -rw-r--r-- | src/xinput.h | 1 |
1 files changed, 0 insertions, 1 deletions
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); |