From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 8 May 2009 05:15:45 +0000 (+1000)
Subject: Merge branch 'master' into xi2
X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/9c6a51e8aaba50b8f3a0f3ad767c34a80aee55a1?ds=sidebyside;hp=9c6a51e8aaba50b8f3a0f3ad767c34a80aee55a1

Merge branch 'master' into xi2

Conflicts:
	src/xinput.h
---