summaryrefslogtreecommitdiff
path: root/policy.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:21 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:21 +0000
commit4e28ae75ceb86e2e3b51125808cbeadc3dcaeb79 (patch)
treeb45ec16e84aeb04ee3a9042d872209f0258416db /policy.c
parentbe98669d74b588aacf946cbf1c2d09421796d260 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'policy.c')
-rw-r--r--policy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/policy.c b/policy.c
index 48097c5..9237b5d 100644
--- a/policy.c
+++ b/policy.c
@@ -33,7 +33,7 @@ from The Open Group.
*
* policy.c. Implement site-dependent policy for XDMCP connections
*/
-/* $XFree86: xc/programs/xdm/policy.c,v 3.9 2004/01/01 17:12:34 herrb Exp $ */
+/* $XFree86: policy.c,v 3.8 2002/12/07 20:31:04 herrb Exp $ */
# include "dm.h"
# include "dm_auth.h"