diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
| commit | 8b6b40b7271acd81a9548f502c18f46f3b640640 (patch) | |
| tree | 1462cb63501a8bdd8845d7c62e038b6a86b78fd5 /afb | |
| parent | ab7a6d860d4a275a810a64b1ba7b13726ed10575 (diff) | |
| parent | 3305d17195e3a0a5555300555bd7703312fa489f (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-reworkpci-rework
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
Diffstat (limited to 'afb')
| -rw-r--r-- | afb/afbbres.c | 1 | ||||
| -rw-r--r-- | afb/afbbresd.c | 1 | ||||
| -rw-r--r-- | afb/afbbstore.c | 1 | ||||
| -rw-r--r-- | afb/afbfont.c | 1 | ||||
| -rw-r--r-- | afb/afbmisc.c | 1 | ||||
| -rw-r--r-- | afb/afbpntwin.c | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/afb/afbbres.c b/afb/afbbres.c index e8f1b3b85..dae4746a0 100644 --- a/afb/afbbres.c +++ b/afb/afbbres.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbbresd.c b/afb/afbbresd.c index 4495c8cf8..4f07ede6c 100644 --- a/afb/afbbresd.c +++ b/afb/afbbresd.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbbstore.c b/afb/afbbstore.c index f7f1062e2..32d64ec47 100644 --- a/afb/afbbstore.c +++ b/afb/afbbstore.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* diff --git a/afb/afbfont.c b/afb/afbfont.c index 940bdb09b..11a449423 100644 --- a/afb/afbfont.c +++ b/afb/afbfont.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Copyright (c) 1987 X Consortium diff --git a/afb/afbmisc.c b/afb/afbmisc.c index 023c43f34..8e9c9e8e9 100644 --- a/afb/afbmisc.c +++ b/afb/afbmisc.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c index 94c96e4cf..6082f7caa 100644 --- a/afb/afbpntwin.c +++ b/afb/afbpntwin.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** |