diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:19 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:19 +0000 |
commit | b90161d474d09cdadcbaa45f176e8302b8b40081 (patch) | |
tree | e1b81a0750c403355a05169982fc0c46b6d7f42d /AuFileName.c | |
parent | 54e72e37c7001a5156efe090038c50726854945c (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 'AuFileName.c')
-rw-r--r-- | AuFileName.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AuFileName.c b/AuFileName.c index a1bb520..d1057fa 100644 --- a/AuFileName.c +++ b/AuFileName.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/AuFileName.c,v 3.7 2001/12/14 19:54:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuFileName.c,v 3.6 2001/07/25 15:04:48 dawes Exp $ */ #include <X11/Xauth.h> #include <X11/Xos.h> |