]> diplodocus.org Git - xorg-xinput/commitdiff
Merge branch 'master' into xi2
authorPeter Hutterer <peter.hutterer@who-t.net>
Fri, 8 May 2009 05:15:45 +0000 (15:15 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Fri, 8 May 2009 05:15:45 +0000 (15:15 +1000)
Conflicts:
src/xinput.h


No differences found