From 32374e99f9712871cee0f1ee01c227cb1cf7cec7 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:41:18 +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).

---
 viewres.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'viewres.c')

diff --git a/viewres.c b/viewres.c
index f403ceb..211e652 100644
--- a/viewres.c
+++ b/viewres.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from the X Consortium.
  * *
  * Author:  Jim Fulton, MIT X Consortium
  */
-/* $XFree86: xc/programs/viewres/viewres.c,v 1.7 2003/09/08 20:49:47 herrb Exp $ */
+/* $XFree86: xc/programs/viewres/viewres.c,v 1.6 2003/05/27 22:26:58 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
-- 
cgit v1.2.3