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

---
 rgb.c       | 2 +-
 showrgb.c   | 2 +-
 showrgb.man | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rgb.c b/rgb.c
index a881eb9..686d914 100644
--- a/rgb.c
+++ b/rgb.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/rgb/rgb.c,v 3.9 2002/10/09 16:56:47 tsi Exp $ */
+/* $XFree86: xc/programs/rgb/rgb.c,v 3.8tsi Exp $ */
 
 
 /* reads from standard input lines of the form:
diff --git a/showrgb.c b/showrgb.c
index 1762dcb..2b6e998 100644
--- a/showrgb.c
+++ b/showrgb.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Jim Fulton, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/rgb/showrgb.c,v 3.9 2002/05/31 18:46:08 dawes Exp $ */
+/* $XFree86: xc/programs/rgb/showrgb.c,v 3.8 2001/12/14 20:01:04 dawes Exp $ */
 
 #ifndef USE_RGB_TXT
 #ifdef NDBM
diff --git a/showrgb.man b/showrgb.man
index c0b5756..4778935 100644
--- a/showrgb.man
+++ b/showrgb.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/rgb/showrgb.man,v 1.8 2002/10/12 16:06:45 herrb Exp $
+.\" $XFree86: xc/programs/rgb/showrgb.man,v 1.7 2001/12/14 20:01:04 dawes Exp $
 .\"
 .TH SHOWRGB 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3