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

---
 src/SMlibint.h   | 2 +-
 src/globals.h    | 2 +-
 src/sm_auth.c    | 2 +-
 src/sm_error.c   | 2 +-
 src/sm_genid.c   | 2 +-
 src/sm_process.c | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/SMlibint.h b/src/SMlibint.h
index 2e559de..e9fa9cd 100644
--- a/src/SMlibint.h
+++ b/src/SMlibint.h
@@ -25,7 +25,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/lib/SM/SMlibint.h,v 1.4 2001/12/14 19:53:55 dawes Exp $ */
+/* $XFree86: xc/lib/SM/SMlibint.h,v 1.3 2001/07/29 05:01:11 tsi Exp $ */
 
 /*
  * Author: Ralph Mor, X Consortium
diff --git a/src/globals.h b/src/globals.h
index b3ef69f..2f26a78 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -25,7 +25,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/lib/SM/globals.h,v 1.5 2002/05/31 18:45:41 dawes Exp $ */
+/* $XFree86: xc/lib/SM/globals.h,v 1.4 2001/12/14 19:53:55 dawes Exp $ */
 
 /*
  * Author: Ralph Mor, X Consortium
diff --git a/src/sm_auth.c b/src/sm_auth.c
index 7057fd6..111235e 100644
--- a/src/sm_auth.c
+++ b/src/sm_auth.c
@@ -25,7 +25,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/lib/SM/sm_auth.c,v 1.4 2003/10/23 21:38:22 tsi Exp $ */
+/* $XFree86$ */
 
 /*
  * Author: Ralph Mor, X Consortium
diff --git a/src/sm_error.c b/src/sm_error.c
index 728de79..8cd7989 100644
--- a/src/sm_error.c
+++ b/src/sm_error.c
@@ -25,7 +25,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/lib/SM/sm_error.c,v 1.3 2001/12/14 19:53:55 dawes Exp $ */
+/* $XFree86: xc/lib/SM/sm_error.c,v 1.2 2001/10/28 03:32:29 tsi Exp $ */
 
 /*
  * Author: Ralph Mor, X Consortium
diff --git a/src/sm_genid.c b/src/sm_genid.c
index 01e6e35..67b3317 100644
--- a/src/sm_genid.c
+++ b/src/sm_genid.c
@@ -25,7 +25,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/lib/SM/sm_genid.c,v 3.18 2004/01/20 03:36:27 dawes Exp $ */
+/* $XFree86: xc/lib/SM/sm_genid.c,v 3.17 2003/07/09 15:27:28 tsi Exp $ */
 
 /*
  * Author: Ralph Mor, X Consortium
diff --git a/src/sm_process.c b/src/sm_process.c
index 44f088b..8f913f0 100644
--- a/src/sm_process.c
+++ b/src/sm_process.c
@@ -25,7 +25,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/lib/SM/sm_process.c,v 1.3 2003/05/27 22:26:25 tsi Exp $ */
+/* $XFree86$ */
 
 /*
  * Author: Ralph Mor, X Consortium
-- 
cgit v1.2.3