From 4e28ae75ceb86e2e3b51125808cbeadc3dcaeb79 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:21 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- streams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'streams.c') diff --git a/streams.c b/streams.c index 720b4cc..c09ce6e 100644 --- a/streams.c +++ b/streams.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xdm/streams.c,v 3.8 2003/10/27 21:39:08 herrb Exp $ */ +/* $XFree86: xc/programs/xdm/streams.c,v 3.7 2003/07/09 15:27:39 tsi Exp $ */ /* * xdm - display manager daemon -- cgit v1.2.3