Peter Hutterer 1f97a76476 Merge branch 'master' into mpx ... Conflicts: dix/devices.c hw/xfree86/common/xf86Xinput.c hw/xfree86/loader/xf86sym.c mi/mieq.c		2007-06-19 17:20:52 +09:30
..
common	Merge branch 'master' into mpx	2007-06-19 17:20:52 +09:30
ddc	Delete VDIF support; it was never used anyway.	2007-06-02 16:07:20 -04:00
dixmods	…
doc	…
dri	Merge branch 'master' into mpx	2007-06-19 17:20:52 +09:30
dummylib	…
exa	…
fbdevhw	…
i2c	…
int10	…
loader	Merge branch 'master' into mpx	2007-06-19 17:20:52 +09:30
modes	Merge branch 'master' into mpx	2007-06-19 17:20:52 +09:30
os-support	Merge branch 'master' into mpx	2007-06-19 17:20:52 +09:30
parser	…
rac	…
ramdac	…
scanpci	…
shadowfb	…
utils	…
vbe	…
vgahw	…
x86emu	…
xaa	…
xf1bpp	…
xf4bpp	…
xf8_16bpp	…
xf8_32bpp	…
Makefile.am	…
Options	…
xorgconf.cpp	…