summaryrefslogtreecommitdiff
path: root/AuUnlock.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:19 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:19 +0000
commitb90161d474d09cdadcbaa45f176e8302b8b40081 (patch)
treee1b81a0750c403355a05169982fc0c46b6d7f42d /AuUnlock.c
parent54e72e37c7001a5156efe090038c50726854945c (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASE
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 'AuUnlock.c')
-rw-r--r--AuUnlock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/AuUnlock.c b/AuUnlock.c
index 8783b56..bc695ad 100644
--- a/AuUnlock.c
+++ b/AuUnlock.c
@@ -25,7 +25,7 @@ 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/lib/Xau/AuUnlock.c,v 1.5 2003/11/17 22:20:21 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/AuUnlock.c,v 1.4 2001/12/14 19:54:36 dawes Exp $ */
#include <X11/Xauth.h>
#include <X11/Xos.h>