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
..
2007-05-11 11:43:19 -04:00
2008-01-03 17:04:54 +10:30
2007-11-05 14:34:41 +00:00
2007-11-05 19:08:36 -05:00
2006-07-21 17:56:00 -04:00
2007-11-05 14:34:41 +00:00
2007-08-25 15:08:20 -04:00
2007-08-25 15:08:20 -04:00
2006-07-21 17:56:00 -04:00
2007-04-09 14:33:15 -07:00
2006-07-21 17:56:00 -04:00
2007-11-20 18:31:07 -08:00
2006-11-23 17:15:14 +10:30
2007-03-25 17:56:32 -04:00
2008-01-03 17:04:54 +10:30
2008-02-14 09:32:54 +10:30
2008-01-18 18:48:46 +10:30
2007-11-05 14:34:41 +00:00
2007-03-25 17:56:32 -04:00
2007-11-05 14:34:41 +00:00
2007-05-11 11:43:19 -04:00
2007-11-05 14:34:41 +00:00
2006-07-21 17:56:00 -04:00
2006-07-21 17:56:00 -04:00
2007-11-05 14:34:41 +00:00
2008-03-04 18:11:10 +10:30
2007-11-19 16:34:38 -05:00
2007-09-19 07:25:55 -04:00
2006-07-21 17:56:00 -04:00
2008-03-04 18:11:10 +10:30
2008-01-03 17:04:54 +10:30
2006-10-25 01:10:20 +03:00
2007-06-29 14:06:52 -04:00
2007-03-25 17:56:32 -04:00
2007-11-05 14:34:41 +00:00
2007-11-05 14:34:41 +00:00
2007-11-05 14:34:41 +00:00
2007-11-05 14:34:41 +00:00
2006-07-21 17:56:00 -04:00
2007-03-25 17:56:32 -04:00
2007-03-25 17:56:32 -04:00
2007-11-17 21:23:05 -05:00
2007-12-07 20:23:36 +10:30
2006-07-21 17:56:00 -04:00
2007-12-17 14:59:12 +10:00
2007-11-05 14:34:41 +00:00
2007-03-25 17:56:32 -04:00
2008-01-03 17:04:54 +10:30
2007-04-19 17:49:34 -07:00
2007-11-07 15:37:23 +10:30
2007-06-29 14:06:52 -04:00
2007-06-29 14:06:52 -04:00
2007-08-25 15:08:20 -04:00
2007-11-05 14:34:41 +00:00
2007-03-25 17:56:32 -04:00
2007-09-13 00:08:53 +00:00
2007-11-05 14:34:41 +00:00
2007-03-25 17:56:32 -04:00
2006-07-21 17:56:00 -04:00
2007-11-05 14:34:41 +00:00