From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon, 7 Apr 2008 07:54:16 +0000 (+0930)
Subject: Merge branch 'master' into mpx
X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/e3b705dc15d07bbb478ced6b54a5e0553d978113?ds=sidebyside;hp=--cc

Merge branch 'master' into mpx

Conflicts:

	src/xinput.c

(just a whitespace conflict)
---

e3b705dc15d07bbb478ced6b54a5e0553d978113