diff options
| author | Ian Romanick <idr@umwelt.(none)> | 2006-07-25 11:30:04 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@umwelt.(none)> | 2006-07-25 11:30:04 -0700 |
| commit | 380b51d605a82c98082a2cebd70a0d1d0735eaa7 (patch) | |
| tree | ad8dce1ce07ab02885e41baa647ca9324522a1e2 /xorg-server.m4 | |
| parent | 82f6b7e75e04e3fb951ab71ad3c553c8b34ea995 (diff) | |
| parent | 8977b07434d75ca396d236dc1324f0c862b633c7 (diff) | |
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.
Diffstat (limited to 'xorg-server.m4')
0 files changed, 0 insertions, 0 deletions