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/kdrive/chips/chips.h | |
| 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/kdrive/chips/chips.h')
| -rw-r--r-- | hw/kdrive/chips/chips.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/hw/kdrive/chips/chips.h b/hw/kdrive/chips/chips.h index f7b9784c6..6ad17fe25 100644 --- a/hw/kdrive/chips/chips.h +++ b/hw/kdrive/chips/chips.h @@ -1,6 +1,4 @@ /* - * Id: chips.h,v 1.2 1999/11/02 08:17:24 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/chips/chips.h,v 1.9 2000/11/29 08:42:25 keithp Exp $ */ #ifndef _CHIPS_H_ #define _CHIPS_H_ |