summaryrefslogtreecommitdiff
path: root/xhost.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:27 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:27 +0000
commit52c55f6473ea5f92b2a336414d01829a34050b5e (patch)
tree48cb11f5ba4b97cfe6e71801c9efaf477abe6aa4 /xhost.c
parentc1d2180c8ad2f87365c2e33fa129a50806b48c17 (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 'xhost.c')
-rw-r--r--xhost.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xhost.c b/xhost.c
index abe6b9b..ced2494 100644
--- a/xhost.c
+++ b/xhost.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/xhost/xhost.c,v 3.27 2003/07/29 07:23:27 herrb Exp $ */
+/* $XFree86: xc/programs/xhost/xhost.c,v 3.26 2003/07/27 14:05:45 herrb Exp $ */
#if defined(TCPCONN) || defined(STREAMSCONN) || defined(AMTCPCONN)
#define NEEDSOCKETS