summaryrefslogtreecommitdiff
path: root/auth.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 /auth.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 'auth.c')
-rw-r--r--auth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/auth.c b/auth.c
index 99ffd44..22a7ba1 100644
--- a/auth.c
+++ b/auth.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/xdm/auth.c,v 3.33 2004/01/16 00:03:54 herrb Exp $ */
+/* $XFree86: xc/programs/xdm/auth.c,v 3.32 2003/12/22 17:48:12 tsi Exp $ */
/*
* xdm - display manager daemon