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/src/kcurscol.c | |
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/src/kcurscol.c')
-rw-r--r-- | hw/kdrive/src/kcurscol.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/kdrive/src/kcurscol.c b/hw/kdrive/src/kcurscol.c index 943417e0d..6a17df30f 100644 --- a/hw/kdrive/src/kcurscol.c +++ b/hw/kdrive/src/kcurscol.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/kcurscol.c,v 1.4 2000/05/11 18:14:13 tsi Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its |