mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-19 20:02:21 +00:00
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
This commit is contained in:
commit
c2535f6792
1265 changed files with 5182 additions and 5954 deletions
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in a new issue