diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:18 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:18 +0000 |
commit | c95d1905fedf57110f351da140a6797e08b4c462 (patch) | |
tree | bc5bc9e89e76dd9365abc21e4173c86817b8f485 /process.c | |
parent | 29ab900fba1b60129947a7ba8159d86a8adebebf (diff) | |
download | xorg-app-xauth-c95d1905fedf57110f351da140a6797e08b4c462.tar.gz |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTDAMAGE-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 'process.c')
-rw-r--r-- | process.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xauth/process.c,v 3.24 2004/01/21 23:49:40 herrb Exp $ */ +/* $XFree86: xc/programs/xauth/process.c,v 3.23 2003/11/25 03:15:04 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium |