]> diplodocus.org Git - xorg-xinput/commit
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)
commita783c19f94e6fed28aeaf0550558cd0b63402b9c
tree0e9058d7e7d7b136ef3cf77cf8ae0ffb84b99e06
parent65e3e12fa6fc2043fbb0122c72a4f7df09b1c659
parent4e6e0dd562e8e844bede349bd11c339644447d78
Merge branch 'master' into xi2

Conflicts:
src/property.c
src/xinput.c
src/xinput.h
configure.ac
src/list.c
src/property.c
src/xinput.c
src/xinput.h