Peter Hutterer 99d28c3ef3 Merge branch 'master' into mpx ... Conflicts: Xext/xprint.c (removed in master) config/hal.c dix/main.c hw/kdrive/ati/ati_cursor.c (removed in master) hw/kdrive/i810/i810_cursor.c (removed in master) hw/xprint/ddxInit.c (removed in master) xkb/ddxLoad.c		2008-05-20 10:20:14 +09:30
..
common	Merge branch 'master' into mpx	2008-05-20 10:20:14 +09:30
ddc	…
dixmods	Merge branch 'master' into mpx	2008-05-02 11:00:14 +09:30
doc	Minor xorg.conf manpage fixups	2008-04-20 20:36:44 +02:00
dri	Merge branch 'master' into mpx	2008-05-02 11:00:14 +09:30
dri2	Pick up dri2proto from the standard proto header include path.	2008-04-02 19:21:41 -04:00
dummylib	…
exa	…
fbdevhw	Fix fbdevhw initialization for PCI drivers.	2008-05-12 14:53:37 -04:00
i2c	…
int10	Fix PCI config space cycles from int10 emulator.	2008-04-04 12:58:12 -04:00
loader	Merge branch 'master' into mpx	2008-05-02 11:00:14 +09:30
modes	Merge branch 'master' into mpx	2008-05-20 10:20:14 +09:30
os-support	OpenBSD doesn't define __x86_64__, simplify tests.	2008-05-17 13:14:31 +02:00
parser	…
rac	…
ramdac	Remove UndisplayCursor API.	2008-05-13 11:17:02 +09:30
shadowfb	…
utils	xorgcfg: Fix a crash if xorg.conf doesn't have a Files section.	2008-05-01 15:55:15 +09:30
vbe	…
vgahw	…
x86emu	Check for __x86_64__ when we check for __amd64__	2008-04-12 20:39:18 +02:00
xaa	Bug #13104: Remove broken XAA a1 glyph fast path.	2008-05-08 16:04:24 -04:00
xf1bpp	…
xf4bpp	…
xf8_16bpp	…
Makefile.am	So long, and thanks for all the cfb.	2008-04-11 09:47:51 -04:00
Options	…
xorgconf.cpp	…