xserver-multidpi/hw
Ian Romanick 8b6b40b727 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86.h
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/generic.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/loader/xf86sym.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/Pci.h
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/int10/linux.c
2007-08-23 18:19:17 -07:00
..
darwin Darwin: Remove missing file 2007-08-01 07:27:53 +03:00
dmx Death to RCS tags. 2007-06-29 14:06:52 -04:00
kdrive Kdrive: fix nasty thinko in TslibEnable() 2007-08-16 09:46:27 +02:00
vfb Split the xserver/fb/fbcmap.c file into two files. 2007-04-03 09:28:21 -06:00
xfree86 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
xgl Death to RCS tags. 2007-06-29 14:06:52 -04:00
xnest Death to RCS tags. 2007-06-29 14:06:52 -04:00
xprint Remove duplicated licenses 2007-08-01 08:08:37 +03:00
xwin Death to RCS tags. 2007-06-29 14:06:52 -04:00
Makefile.am dix mods for Darwin 2007-02-17 01:21:43 -08:00