Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into multitouch
authorPeter Hutterer <peter.hutterer@who-t.net>
Wed, 21 Dec 2011 23:29:59 +0000 (09:29 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Wed, 21 Dec 2011 23:29:59 +0000 (09:29 +1000)
commite395efc25f9fd60377f32c2bf1a9153d70908236
tree8f8a4fdd19f7ab2aba423f1279b29c336a3060eb
parent2bb282cd45cb8149b39d72397ef5bbcfebca11d2
parentfcda98c48610fd507ca0b89c6006a5497d9dc1c9
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into multitouch

Conflicts:
configure.ac
dix/inpututils.c

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
configure.ac
hw/xfree86/common/xf86Xinput.h
include/dix.h