diff options
| author | Ian Romanick <idr@us.ibm.com> | 2006-12-08 17:24:15 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2006-12-08 17:24:15 -0800 |
| commit | e1f73d220873fa091695e46b7fcd008663a95a6f (patch) | |
| tree | e6e58038b6aea53eca32326a903de4074600df54 /.gitignore | |
| parent | 27d682fa030501611a5b52f41f29738134b45c0b (diff) | |
| parent | d56249a15ead51ad4d2117d5538ada24af05b693 (diff) | |
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
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 4118cd001..62b5fd6b4 100644 --- a/.gitignore +++ b/.gitignore @@ -267,3 +267,4 @@ mfb/mfbteblack.c mfb/mfbtewhite.c mfb/mfbtileC.c mfb/mfbtileG.c +.*.swp |