Ian Romanick 07ad92d2c4 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework ...

Conflicts:

	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c

2006-07-21 15:25:35 -07:00

..

darwin

get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE

2006-07-18 18:17:38 -04:00

dmx

Remove the DDXTIME conditional, for being unused.

2006-07-20 17:33:13 -04:00

kdrive

fix KdXvCopyPackedData to actually work

2006-07-21 15:17:35 -04:00

vfb

Remove the DDXTIME conditional, for being unused.

2006-07-20 17:33:13 -04:00

xfree86

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework

2006-07-21 15:25:35 -07:00

xgl

get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE

2006-07-18 18:17:38 -04:00

xnest

Remove the DDXTIME conditional, for being unused.

2006-07-20 17:33:13 -04:00

xprint

Remove the DDXTIME conditional, for being unused.

2006-07-20 17:33:13 -04:00

xwin

Remove the DDXTIME conditional, for being unused.

2006-07-20 17:33:13 -04:00

Makefile.am

Xprint/ -> hw/xprint

2006-06-18 21:07:28 -04:00