andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7b4f3616f7
xserver-multidpi/hw/xfree86
History
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
..
common Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
ddc Don't carp on EDID 1.4 blocks anymore. 2007-12-28 16:53:17 -05:00
dixmods Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
doc No more "-scanpci" given that we already have it in libpciaccess. 2008-02-25 17:08:07 -03:00
dri Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
dri2 GLX: Implement support for TTM BO based TFP when available. 2008-02-14 22:20:56 -05:00
dummylib No more "-scanpci" given that we already have it in libpciaccess. 2008-02-25 17:08:07 -03:00
exa Friends don't let friends call xf86AddModuleInfo. 2008-02-14 08:21:44 +11:00
fbdevhw Fix magic number in fbdevhw 2007-11-02 12:05:41 -04:00
i2c Fixing xf86I2CGetScreenBuses(), now dereferencing the correct pointer. 2007-09-04 16:42:57 +02:00
int10 Fixing a misleading comment which could suggest a GPL violation. 2007-08-30 14:28:06 +02:00
loader Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
modes Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
os-support Merge branch 'master' into mpx 2008-03-04 18:11:10 +10:30
parser Eradicate the VTInit code. 2008-02-14 07:52:46 +11:00
rac Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
ramdac Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
shadowfb Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
utils Use the client-side XKB headers for the config utilities 2008-02-22 18:36:29 -05:00
vbe Bug #13736: Fix %bx in VBEGetPixelClock to match spec. 2008-02-24 20:25:13 -05:00
vgahw XFree86: Remove usage of alloca 2007-11-05 14:34:42 +00:00
x86emu X86EMU: handle CPUID instruction 2008-02-08 10:48:40 -08:00
xaa Friends don't let friends call xf86AddModuleInfo. 2008-02-14 08:21:44 +11:00
xf1bpp Remove the PaintWindow optimization. 2007-09-13 00:08:53 +00:00
xf4bpp Merge branch 'master' into XACE-SELINUX 2007-11-19 18:10:46 -05:00
xf8_16bpp Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
xf8_32bpp Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
Makefile.am Add DRI2 module. 2008-02-14 19:53:49 -05:00
Options
xorgconf.cpp Remove all traces of external RGB database (and Speedo) 2007-11-05 16:28:35 +00:00