frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
xserver/hw/xfree86
History
Ian Romanick e1f73d2208 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86Configure.c
	hw/xfree86/common/xf86Helper.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/lnx_pci.c
	hw/xfree86/scanpci/Makefile.am
	hw/xfree86/utils/pcitweak/Makefile.am
	hw/xfree86/utils/scanpci/Makefile.am
 		2006-12-08 17:24:15 -08:00
..
common Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2006-12-08 17:24:15 -08:00
ddc Separate DDC mode list creation from MonPtr creation. 2006-11-28 11:13:43 -08:00
dixmods remove CID support (bug #5553) 2006-12-06 23:24:23 +02:00
doc Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-12-08 15:52:37 -06:00
dri Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2006-12-08 17:24:15 -08:00
dummylib Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
exa Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
fbdevhw Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2006-12-08 17:24:15 -08:00
i2c Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
int10 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2006-12-08 17:24:15 -08:00
loader Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2006-12-08 17:24:15 -08:00
os-support Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2006-12-08 17:24:15 -08:00
parser Merge master back to randr-1.2 2006-11-04 17:46:26 -08:00
rac Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
ramdac Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
scanpci Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2006-12-08 17:24:15 -08:00
shadowfb Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
utils Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2006-12-08 17:24:15 -08:00
vbe Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
vgahw Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2006-12-08 17:24:15 -08:00
x86emu Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
xaa Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
xf1bpp Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf4bpp Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
xf8_16bpp Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
xf8_32bpp Remove smashing of CFLAGS from server build. 2006-09-18 12:11:18 -07:00
Makefile.am Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2006-12-08 17:24:15 -08:00
Options
…
xorgconf.cpp remove CID support (bug #5553) 2006-12-06 23:24:23 +02:00