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
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
46f55f5dea
Initial batch of changes for PCI rework. All future changes will be
...
tracked individually.
2006-06-07 14:09:02 -07:00
a68c11bb1d
Mark everything in xf86sym.c as _X_EXPORT.
2006-03-25 19:52:05 +00:00
44f4713a05
Encoding of numerous files changed to UTF-8
2004-12-04 00:43:13 +00:00
2fb5886200
Merging XORG-CURRENT into trunk
2004-04-23 19:54:30 +00:00
dae90c3af9
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
2004-03-14 08:34:49 +00:00
867451f1ab
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
2004-03-03 12:12:50 +00:00
df0313d35b
readding XFree86's cvs IDs
2004-02-26 13:36:15 +00:00
147aae87fd
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
2004-02-26 09:23:53 +00:00
adc7f9a4eb
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
2003-11-25 19:29:01 +00:00
9508a382f8
Initial revision
2003-11-14 16:48:57 +00:00
Ian Romanick
Adam Jackson
Ian Romanick
Adam Jackson
Markus Kuhn
Egbert Eich
Kaleb Keithley