From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 7 May 2009 03:06:05 +0000 (+1000)
Subject: Merge branch 'master' into xi2
X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/a783c19f94e6fed28aeaf0550558cd0b63402b9c?hp=a783c19f94e6fed28aeaf0550558cd0b63402b9c

Merge branch 'master' into xi2

Conflicts:
	src/property.c
	src/xinput.c
	src/xinput.h
---