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

---
 cppsetup.c     | 2 +-
 def.h          | 2 +-
 ifparser.c     | 2 +-
 ifparser.h     | 2 +-
 imakemdep.h    | 2 +-
 include.c      | 2 +-
 main.c         | 2 +-
 makedepend.man | 2 +-
 parse.c        | 2 +-
 pr.c           | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cppsetup.c b/cppsetup.c
index 49a746a..c7ac256 100644
--- a/cppsetup.c
+++ b/cppsetup.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.11 2001/12/17 20:52:22 dawes Exp $ */
+/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.10 2001/12/14 19:53:20 dawes Exp $ */
 
 #include "def.h"
 
diff --git a/def.h b/def.h
index f80c9d2..7a1be77 100644
--- a/def.h
+++ b/def.h
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/makedepend/def.h,v 3.14 2003/01/17 17:09:49 tsi Exp $ */
+/* $XFree86: xc/config/makedepend/def.h,v 3.13tsi Exp $ */
 
 #include "Xos.h"
 #include "Xfuncproto.h"
diff --git a/ifparser.c b/ifparser.c
index d8d9e76..aa51748 100644
--- a/ifparser.c
+++ b/ifparser.c
@@ -59,7 +59,7 @@
  * 
  *     ParseIfExpression		parse a string for #if
  */
-/* $XFree86: xc/config/makedepend/ifparser.c,v 3.11 2002/09/23 01:48:08 tsi Exp $ */
+/* $XFree86: xc/config/makedepend/ifparser.c,v 3.10tsi Exp $ */
 
 #include "ifparser.h"
 #include <ctype.h>
diff --git a/ifparser.h b/ifparser.h
index 89d2a2f..398a3e4 100644
--- a/ifparser.h
+++ b/ifparser.h
@@ -57,7 +57,7 @@
  *     ParseIfExpression		parse a string for #if
  */
 
-/* $XFree86: xc/config/makedepend/ifparser.h,v 3.5 2001/07/25 15:04:40 dawes Exp $ */
+/* $XFree86: xc/config/makedepend/ifparser.h,v 3.4 2001/01/17 16:38:58 dawes Exp $ */
 
 #include <stdio.h>
 
diff --git a/imakemdep.h b/imakemdep.h
index f272429..db17752 100644
--- a/imakemdep.h
+++ b/imakemdep.h
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/imake/imakemdep.h,v 3.72 2003/12/30 01:53:52 tsi Exp $ */
+/* $XFree86: xc/config/imake/imakemdep.h,v 3.71 2003/06/12 14:12:26 eich Exp $ */
 
 
 /* 
diff --git a/include.c b/include.c
index 4e32800..65ce783 100644
--- a/include.c
+++ b/include.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/makedepend/include.c,v 3.7 2001/12/14 19:53:20 dawes Exp $ */
+/* $XFree86: xc/config/makedepend/include.c,v 3.6 2001/04/29 23:25:02 tsi Exp $ */
 
 
 #include "def.h"
diff --git a/main.c b/main.c
index 5a95943..1811bcd 100644
--- a/main.c
+++ b/main.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/makedepend/main.c,v 3.32 2003/03/26 20:43:48 tsi Exp $ */
+/* $XFree86: xc/config/makedepend/main.c,v 3.31tsi Exp $ */
 
 #include "def.h"
 #ifdef hpux
diff --git a/makedepend.man b/makedepend.man
index 595c87e..ac67cc8 100644
--- a/makedepend.man
+++ b/makedepend.man
@@ -23,7 +23,7 @@
 .\" dealing in this Software without prior written authorization from The
 .\" Open Group.
 .\"
-.\" $XFree86: xc/config/makedepend/mkdepend.man,v 1.7 2002/12/14 02:39:45 dawes Exp $
+.\" $XFree86: xc/config/makedepend/mkdepend.man,v 1.6 2001/12/17 20:52:22 dawes Exp $
 .\"
 .TH MAKEDEPEND 1 __xorgversion__
 .UC 4
diff --git a/parse.c b/parse.c
index 968d2c4..935c61d 100644
--- a/parse.c
+++ b/parse.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/makedepend/parse.c,v 1.12 2002/02/26 05:09:10 tsi Exp $ */
+/* $XFree86: xc/config/makedepend/parse.c,v 1.11 2001/12/17 20:52:22 dawes Exp $ */
 
 #include "def.h"
 
diff --git a/pr.c b/pr.c
index e864793..5d0e1c4 100644
--- a/pr.c
+++ b/pr.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/makedepend/pr.c,v 1.5 2001/12/14 19:53:21 dawes Exp $ */
+/* $XFree86: xc/config/makedepend/pr.c,v 1.4 2001/04/29 23:25:02 tsi Exp $ */
 
 #include "def.h"
 
-- 
cgit v1.2.1