xserver-multidpi/hw
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
..
dmx Fix Xinerama's consolidated visual handling. 2008-02-22 15:19:54 -05:00
kdrive Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
vfb Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
xfree86 Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
xgl No more "-scanpci" given that we already have it in libpciaccess. 2008-02-25 17:08:07 -03:00
xnest Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
xprint Use strerror instead of errno values in user strings. 2008-02-14 07:52:02 +11:00
xquartz XQuartz: Quit now properly warns the user 2008-02-23 00:28:41 -08:00
xwin Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
Makefile.am Darwin: Use __APPLE__ instead of __DARWIN__ 2007-12-07 18:54:58 -08:00