Merge remote-tracking branch 'whot/two-screen-coordinates'
authorKeith Packard <keithp@keithp.com>
Thu, 3 Nov 2011 04:20:07 +0000 (21:20 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 3 Nov 2011 04:20:07 +0000 (21:20 -0700)
commitd91aa0e6601bdf3e2cfa57b3412ab14ac486edc4
tree7c18b19cfd5fb4d05f54549121fda33e1b9cd249
parent8df3a9ca5abbd56eb2013fa65250d21a8f18865b
parent401150d7dcad08be7c1f07e076f810cd61e2105c
Merge remote-tracking branch 'whot/two-screen-coordinates'
dix/devices.c
dix/dispatch.c
dix/getevents.c
dix/inpututils.c
hw/xfree86/common/xf86Xinput.c
include/input.h
include/inputstr.h