]> diplodocus.org Git - xorg-xinput/commitdiff
Merge branch 'multitouch'
authorPeter Hutterer <peter.hutterer@who-t.net>
Thu, 12 Jan 2012 06:01:28 +0000 (16:01 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Thu, 12 Jan 2012 06:01:28 +0000 (16:01 +1000)
1  2 
src/xinput.c

diff --cc src/xinput.c
Simple merge