]> diplodocus.org Git - xorg-xinput/commit
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)
commit9c6a51e8aaba50b8f3a0f3ad767c34a80aee55a1
tree7028e3b1a5573b2dcf9b6aacc6759e02f6dd710e
parent239cd6a673be2821915301c1b3c3bae063e9dd94
parent4832dc1f3ee8d11eadc99b5cd4e8158773d11f9b
Merge branch 'master' into xi2

Conflicts:
src/xinput.h
src/xinput.h