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 /hw/xgl | |
| 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 'hw/xgl')
| -rw-r--r-- | hw/xgl/egl/evdev.c | 2 | ||||
| -rw-r--r-- | hw/xgl/egl/kinput.c | 3 | ||||
| -rw-r--r-- | hw/xgl/egl/kkeymap.h | 3 |
3 files changed, 0 insertions, 8 deletions
diff --git a/hw/xgl/egl/evdev.c b/hw/xgl/egl/evdev.c index ebfe265a3..fff4524d1 100644 --- a/hw/xgl/egl/evdev.c +++ b/hw/xgl/egl/evdev.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/xgl/egl/kinput.c b/hw/xgl/egl/kinput.c index 5fd23f568..981cffcfa 100644 --- a/hw/xgl/egl/kinput.c +++ b/hw/xgl/egl/kinput.c @@ -1,6 +1,4 @@ /* - * Id: kinput.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.30 2002/11/13 16:37:39 keithp Exp $ */ #include <xgl-config.h> diff --git a/hw/xgl/egl/kkeymap.h b/hw/xgl/egl/kkeymap.h index 9a21d3597..920e807e5 100644 --- a/hw/xgl/egl/kkeymap.h +++ b/hw/xgl/egl/kkeymap.h @@ -1,6 +1,4 @@ /* - * Id: kkeymap.h,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kkeymap.h,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */ /* * All global variables and functions pertaining to keyboard key mapping * live in this header file. |