xserver-multidpi/hw/xfree86
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
..
common Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
ddc MakeAtom needs length without trailing NUL. sizeof("string") includes NUL. 2007-07-14 12:13:17 -07:00
dixmods Get rid of the type1 font module. 2007-08-23 11:27:33 +02:00
doc Get rid of the type1 font module. 2007-08-23 11:27:33 +02:00
dri Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
dummylib Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
exa Switch the default migration heuristic for EXA to "always". 2006-12-28 13:21:25 -08:00
fbdevhw Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2007-01-19 12:59:54 -08:00
i2c Death to RCS tags. 2007-06-29 14:06:52 -04:00
int10 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
loader Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
modes randr: fixup crtc and output destroy 2007-08-23 16:22:03 +10:00
os-support Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
parser Death to RCS tags. 2007-06-29 14:06:52 -04:00
rac Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
ramdac Since ddc, i2c, and ramdac are in core now, remove their ModuleData stubs. 2007-03-25 22:01:34 -04:00
scanpci Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
shadowfb Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
utils Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
vbe Add VBE PanelID support. 2007-06-27 09:19:28 -04:00
vgahw Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
x86emu Make x86emu's I/O cycle tracing more useful. 2007-07-02 18:41:55 -04:00
xaa Death to RCS tags. 2007-06-29 14:06:52 -04:00
xf1bpp XFree86: xf1bpp: distclean generated files as well 2007-08-01 21:05:04 +03:00
xf4bpp Remove duplicated licenses 2007-08-01 08:08:37 +03:00
xf8_16bpp Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
xf8_32bpp Death to RCS tags. 2007-06-29 14:06:52 -04:00
Makefile.am Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
Options Initial revision 2003-11-14 16:48:57 +00:00
xorgconf.cpp remove CID support (bug #5553) 2006-12-06 23:24:23 +02:00