diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-08-02 14:27:03 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-08-02 14:27:03 -0400 |
| commit | e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74 (patch) | |
| tree | c9639b11acb0ff6c90d774574b0392d81320e84e /hw/xgl | |
| parent | 32c0dcc8c0d1edba5d7e418fd2dc916847a4f069 (diff) | |
| parent | f3955c0a020b39021050cd33c20a17f14fc4b579 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/devices.c
dix/property.c
include/dix.h
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. |