Peter Hutterer
4f2cd0ed96
Merge branch 'master' into mpx
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.
Conflicts:
Xi/opendev.c
dix/devices.c
dix/dixfonts.c
dix/getevents.c
dix/resource.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
mi/mipointer.c
xkb/ddxBeep.c
xkb/ddxCtrls.c
xkb/ddxKeyClick.c
xkb/ddxList.c
xkb/ddxLoad.c
xkb/xkb.c
xkb/xkbAccessX.c
xkb/xkbEvents.c
xkb/xkbInit.c
xkb/xkbPrKeyEv.c
xkb/xkbUtils.c
2008-03-04 18:11:10 +10:30
..
2008-03-04 18:11:10 +10:30
2006-07-18 18:17:38 -04:00
2007-08-30 11:48:45 -04:00
2008-02-22 15:25:26 -05:00
2008-02-22 15:25:26 -05:00
2007-11-20 18:44:56 -05:00
2007-06-29 14:06:52 -04:00
2007-08-28 09:28:25 -04:00