]> diplodocus.org Git - xorg-xinput/commitdiff
Merge branch 'master' into xi2
authorPeter Hutterer <peter.hutterer@who-t.net>
Wed, 20 May 2009 02:10:44 +0000 (12:10 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Wed, 20 May 2009 02:10:44 +0000 (12:10 +1000)
1  2 
src/property.c

diff --cc src/property.c
Simple merge