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/xnest/Xnest.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/xnest/Xnest.h')
| -rw-r--r-- | hw/xnest/Xnest.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h index 8ed3f8902..827030c8f 100644 --- a/hw/xnest/Xnest.h +++ b/hw/xnest/Xnest.h @@ -27,7 +27,6 @@ other dealings in this Software without prior written authorization from the X Consortium. */ -/* $XFree86$ */ /* ** Machines with a 64 bit library interface and a 32 bit server require |