summaryrefslogtreecommitdiff
path: root/Xext/security.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2006-08-10 10:37:59 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2006-08-10 10:37:59 -0700
commitc2535f67923bde0bfb0e72363467110806e2f40f (patch)
tree86e27df1edccb7318a378a25c1a74c212d10ce85 /Xext/security.c
parentc0cb8d1fb80540e093da54da3ee2f55bdf139274 (diff)
parentdb82e12fac5eaa16a39fc1bd0bc31ad95089dc95 (diff)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
Diffstat (limited to 'Xext/security.c')
-rw-r--r--Xext/security.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/Xext/security.c b/Xext/security.c
index b96ac28c3..eca97b7dd 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: xserver/xorg/Xext/security.c,v 1.6 2006/03/28 01:20:59 ajax Exp $ */
-/* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
/*
Copyright 1996, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16tsi Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>