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 /miext/damage | |
| 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 'miext/damage')
| -rwxr-xr-x | miext/damage/damage.c | 2 | ||||
| -rwxr-xr-x | miext/damage/damage.h | 2 | ||||
| -rwxr-xr-x | miext/damage/damagestr.h | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/miext/damage/damage.c b/miext/damage/damage.c index d93074758..2acff11e8 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/damage/damage.h b/miext/damage/damage.h index 36a06545f..4cfc8127d 100755 --- a/miext/damage/damage.h +++ b/miext/damage/damage.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h index 83a202ba8..58ee2bb38 100755 --- a/miext/damage/damagestr.h +++ b/miext/damage/damagestr.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its |