]> diplodocus.org Git - xorg-xinput/commitdiff
Merge branch 'master' into xi2
authorPeter Hutterer <peter.hutterer@who-t.net>
Thu, 7 May 2009 03:06:05 +0000 (13:06 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Thu, 7 May 2009 03:06:05 +0000 (13:06 +1000)
Conflicts:
src/property.c
src/xinput.c
src/xinput.h


No differences found