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

	hw/xfree86/common/xf86Init.c
	hw/xfree86/int10/pci.c
	hw/xfree86/scanpci/xf86PciData.h
	hw/xfree86/scanpci/xf86PciStdIds.h
	hw/xfree86/scanpci/xf86PciStr.h
	hw/xfree86/scanpci/xf86ScanPci.h
	hw/xfree86/utils/pcitweak/pcitweak.c
	hw/xfree86/utils/scanpci/scanpci.c

Re-removed most of the conflicting files.
 		2006-07-25 11:30:04 -07:00
..
common Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
ddc Delete internal usage of the symbol ref/req lists. 2006-07-21 18:47:18 -04:00
dixmods Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
doc get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE 2006-07-18 18:17:38 -04:00
dri Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
dummylib Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
exa get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE 2006-07-18 18:17:38 -04:00
fbdevhw Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
getconfig Add some missing .gitignore stuff for Mesa symlinks and other generated files. 2006-06-18 19:47:51 -07:00
i2c Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
int10 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
loader Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
os-support Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
parser Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
rac Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
ramdac Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
shadowfb Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
utils Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
vbe Delete internal usage of the symbol ref/req lists. 2006-07-21 18:47:18 -04:00
vgahw Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-25 11:30:04 -07:00
x86emu Enable correct handling of the BTS instruction (opcode 0f ab) The code was 2006-03-15 18:43:32 +00:00
xaa Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf1bpp Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
xf4bpp Detach xf4bpp from cfb. 2006-07-21 18:24:37 -04:00
xf8_16bpp get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE 2006-07-18 18:17:38 -04:00
xf8_32bpp Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Makefile.am Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-21 15:25:35 -07:00
Options Initial revision 2003-11-14 16:48:57 +00:00
xorgconf.cpp Merging XORG-CURRENT into trunk 2004-04-23 19:54:30 +00:00