xserver-multidpi/hw/xfree86/common
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
..
atKeynames.h Fix key repeats during VT switch. 2007-09-05 17:46:23 -07:00
compiler.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
extramodes Merging XORG-CURRENT into trunk 2004-04-23 19:54:30 +00:00
fourcc.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Makefile.am No more "-scanpci" given that we already have it in libpciaccess. 2008-02-25 17:08:07 -03:00
modeline2c.awk Get rid of xf86DefModes.c. 2007-12-12 10:59:15 -08:00
scoasm.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
vesamodes Fix standard VESA modes. 2006-11-03 14:06:32 -08:00
xf86.h Friends don't let friends call xf86AddModuleInfo. 2008-02-14 08:21:44 +11:00
xf86AutoConfig.c s/via/openchrome/ in the autoconfig logic. 2008-02-22 16:05:33 -05:00
xf86Build.h.in Print the build time as well as the date if we can. 2007-06-04 02:03:44 -04:00
xf86Bus.c entity sharing: make !shareable entity non-fatal. 2007-12-20 10:11:26 +10:00
xf86Bus.h Simplify system resource range setup. 2007-11-15 15:03:58 -05:00
xf86cmap.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
xf86cmap.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf86Config.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
xf86Config.h First pass at improved video driver autoloading 2007-10-09 22:13:15 -04:00
xf86Configure.c Delete some dead code in X -configure. 2007-11-15 14:45:49 -05:00
xf86Cursor.c Merge branch 'master' into mpx 2007-11-07 15:37:23 +10:30
xf86cvt.c Bug #5386 (partial): Move CVT mode generator from cvt(1) to server core, and 2006-07-28 16:02:02 -04:00
xf86Date.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf86Debug.c Delete some pre-dlloader debugging scaffolding. 2007-07-18 15:45:11 -04:00
xf86DGA.c dix: remove inputInfo.pointer reference in TryClientEvents. 2008-01-18 18:48:46 +10:30
xf86DoProbe.c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
xf86DPMS.c Don't log DPMS enabling as being from xorg.conf if it's not 2008-01-07 20:57:30 -05:00
xf86Events.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
xf86fbBus.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf86fbman.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
xf86fbman.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf86Globals.c Friends don't let friends call xf86AddModuleInfo. 2008-02-14 08:21:44 +11:00
xf86Helper.c xfree86: plug memory leak in xf86LogInit() 2008-02-18 18:14:20 +10:30
xf86Init.c Some doc clean up: 2008-02-25 17:39:33 -03:00
xf86InPriv.h Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-21 19:05:41 -04:00
xf86isaBus.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf86MiscExt.c Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index 2008-01-17 15:26:41 +01:00
xf86Mode.c EDID 1.4: If given a native pixel format, use it when inferring virtual. 2007-12-28 17:38:52 -05:00
xf86Module.h Bump video driver ABI and extension ABI for devPrivates rework. 2007-12-14 00:53:54 -05:00
xf86noBus.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf86Opt.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf86Option.c XFree86: Fix memory leak in option parsing 2007-04-10 23:58:20 +03:00
xf86pciBus.c Clean some garbage caused when pciaccess was merged: 2008-02-25 17:07:07 -03:00
xf86pciBus.h Eliminate unused fields in pciAccRec. 2007-01-17 12:15:09 -08:00
xf86PciInfo.h No more "-scanpci" given that we already have it in libpciaccess. 2008-02-25 17:08:07 -03:00
xf86PM.c xace: restore the old SaveScreens function and introduce new API, since the 2007-11-19 16:59:34 -05:00
xf86Priv.h Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
xf86Privstr.h Eradicate the VTInit code. 2008-02-14 07:52:46 +11:00
xf86RandR.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
xf86Resources.h Remove the now-dead PciAvoid symbol. 2007-08-30 11:26:17 -07:00
xf86sbusBus.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
xf86sbusBus.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf86str.h Friends don't let friends call xf86AddModuleInfo. 2008-02-14 08:21:44 +11:00
xf86Version.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
xf86Versions.c completely remove OS keyboard layer 2006-08-12 18:56:05 +03:00
xf86VidMode.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
xf86Xinput.c Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
xf86Xinput.h xfree86: remove XI86_SHARED_POINTER flag. 2007-10-16 15:50:07 +09:30
xf86XKB.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
xf86xv.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
xf86xv.h Add per-drawable Xv colour key helper function. 2006-10-20 00:42:44 +03:00
xf86xvmc.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
xf86xvmc.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf86xvpriv.h devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
xisb.c Remove the remnants of OS/2 support. 2007-06-28 18:59:05 -04:00
xisb.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
xorgHelper.c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xorgVersion.h Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00