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

---
 ico.c      | 2 +-
 ico.man    | 2 +-
 polyinfo.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ico.c b/ico.c
index f011497..5bcf1c4 100644
--- a/ico.c
+++ b/ico.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/ico/ico.c,v 1.10 2003/05/27 22:26:56 tsi Exp $ */
+/* $XFree86: xc/programs/ico/ico.c,v 1.9tsi Exp $ */
 
 /******************************************************************************
  * Description
diff --git a/ico.man b/ico.man
index 22ca971..fb5d19b 100644
--- a/ico.man
+++ b/ico.man
@@ -1,5 +1,5 @@
 .\" $XConsortium: ico.man,v 1.14 94/04/17 20:45:16 gildea Exp $
-.\" $XFree86: xc/programs/ico/ico.man,v 1.5 2003/05/29 21:48:10 herrb Exp $
+.\" $XFree86: xc/programs/ico/ico.man,v 1.4 2003/03/19 01:49:28 dawes Exp $
 .TH ICO 1 __xorgversion__
 .SH NAME
 ico \- animate an icosahedron or other polyhedron
diff --git a/polyinfo.h b/polyinfo.h
index cc79271..e405623 100644
--- a/polyinfo.h
+++ b/polyinfo.h
@@ -1,7 +1,7 @@
 /* polyinfo.h
  * This is the description of one polyhedron file
  */
-/* $XFree86: xc/programs/ico/polyinfo.h,v 1.3 2000/02/17 14:00:32 dawes Exp $ */
+/* $XFree86$ */
 
 #define MAXVERTS 120
 	/* great rhombicosidodecahedron has 120 vertices */
-- 
cgit v1.2.3