Ian Romanick 8b90913566 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework ... Conflicts: hw/xfree86/Makefile.am hw/xfree86/common/xf86.h hw/xfree86/common/xf86DoScanPci.c hw/xfree86/os-support/bus/linuxPci.c hw/xfree86/scanpci/extrapci.ids hw/xfree86/scanpci/pci.ids hw/xfree86/scanpci/pciid2c.pl hw/xfree86/scanpci/xf86PciStdIds.h		2006-10-24 08:57:59 -07:00
..
darwin	remove .cvsignores from EXTRA_DIST	2006-07-30 11:11:59 +03:00
dmx	Check for visual==NULL in dmxBECreateColormap() before calling XCreateColormap()	2006-09-23 10:38:10 -06:00
kdrive	Fix previous commit breaking other kdrives pulling in fbdev.a	2006-08-31 17:30:24 +01:00
vfb	Make 'Xvfb -render' also disable Composite, lest we segfault on startup.	2006-08-23 14:38:34 -04:00
xfree86	Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework	2006-10-24 08:57:59 -07:00
xgl	get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE	2006-07-18 18:17:38 -04:00
xnest	Make sure _XSERVER64 is defined when it should be and gets tested.	2006-09-06 15:20:55 +02:00
xprint	* Install Xprint's Xsession script to $(sysconfdir)/X11/Xsession.d	2006-09-21 22:19:44 +10:00
xwin	Apply patch in bug #7919, blit improvements in	2006-08-24 13:56:22 +01:00
Makefile.am	Xprint/ -> hw/xprint	2006-06-18 21:07:28 -04:00