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 /include/X11/Xauth.h | |
| 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 'include/X11/Xauth.h')
| -rw-r--r-- | include/X11/Xauth.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/X11/Xauth.h b/include/X11/Xauth.h index 7340687..fa9c96b 100644 --- a/include/X11/Xauth.h +++ b/include/X11/Xauth.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/Xauth.h,v 1.6 2003/11/17 22:20:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/Xauth.h,v 1.5 2001/12/14 19:54:36 dawes Exp $ */ #ifndef _Xauth_h #define _Xauth_h |