diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-11 12:54:46 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-11 12:54:46 +1000 |
| commit | 88cb61e1e55c54982b90e2a77465faaac6a0ba89 (patch) | |
| tree | 0798bc507e7b088e2bdeadd29888a4bd092b036d /include/Makefile.am | |
| parent | 19f43836d1006d253391926e880b14ed2e7a0cf8 (diff) | |
| parent | 4ed4915bc0fbe9b4419ca4a0d4e43c2fee032ae9 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-apiinput-api
Conflicts:
dix/getevents.c
hw/xfree86/common/xf86Xinput.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include/Makefile.am')
0 files changed, 0 insertions, 0 deletions