]> diplodocus.org Git - xorg-xinput/commit
Merge branch 'master' into mpx
authorPeter Hutterer <peter@cs.unisa.edu.au>
Mon, 7 Apr 2008 07:54:16 +0000 (17:24 +0930)
committerPeter Hutterer <peter@cs.unisa.edu.au>
Mon, 7 Apr 2008 07:54:16 +0000 (17:24 +0930)
commite3b705dc15d07bbb478ced6b54a5e0553d978113
tree59151843c1b93283fc7895e62a463ea2a629ba96
parentac3498c9b8a54143a9d023fe530c62e24c4651e0
parent834422a9c68ecf84f5b8477567a785bc8e26217a
Merge branch 'master' into mpx

Conflicts:

src/xinput.c

(just a whitespace conflict)
src/Makefile.am
src/list.c
src/xinput.c
src/xinput.h