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

---
 auth.c     | 2 +-
 auth.h     | 2 +-
 choose.c   | 2 +-
 choose.h   | 2 +-
 globals.c  | 2 +-
 info.c     | 2 +-
 info.h     | 2 +-
 list.h     | 2 +-
 lock.c     | 2 +-
 lock.h     | 2 +-
 log.c      | 2 +-
 log.h      | 2 +-
 mainwin.c  | 2 +-
 mainwin.h  | 2 +-
 misc.c     | 2 +-
 popup.c    | 2 +-
 popup.h    | 2 +-
 prop.c     | 2 +-
 prop.h     | 2 +-
 remote.c   | 2 +-
 restart.c  | 2 +-
 restart.h  | 2 +-
 save.c     | 2 +-
 save.h     | 2 +-
 saveutil.c | 2 +-
 saveutil.h | 2 +-
 signals.c  | 2 +-
 xsm.c      | 2 +-
 xsm.h      | 2 +-
 xsm.man    | 2 +-
 xtwatch.c  | 2 +-
 xtwatch.h  | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/auth.c b/auth.c
index 4eb594a..67f0eca 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/auth.c,v 1.7 2001/12/14 20:02:23 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/auth.c,v 1.6 2001/01/17 23:46:28 dawes Exp $ */
 
 #include "xsm.h"
 
diff --git a/auth.h b/auth.h
index 2302dbb..9e8cec6 100644
--- a/auth.h
+++ b/auth.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/auth.h,v 1.6 2001/12/14 20:02:23 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/auth.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _AUTH_H_
 #define _AUTH_H_
diff --git a/choose.c b/choose.c
index 8abee3f..e1711f9 100644
--- a/choose.c
+++ b/choose.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/choose.c,v 1.7 2003/07/20 16:12:21 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/choose.c,v 1.6tsi Exp $ */
 
 #include "xsm.h"
 #include "saveutil.h"
diff --git a/choose.h b/choose.h
index 31dc9ca..5206338 100644
--- a/choose.h
+++ b/choose.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/choose.h,v 1.6 2001/12/14 20:02:24 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/choose.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _CHOOSE_H_
 #define _CHOOSE_H_
diff --git a/globals.c b/globals.c
index 5bbbc44..2d917d9 100644
--- a/globals.c
+++ b/globals.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/globals.c,v 1.6 2001/12/14 20:02:25 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/globals.c,v 1.5 2001/12/08 18:33:45 herrb Exp $ */
 
 #include <X11/ICE/ICEutil.h>
 
diff --git a/info.c b/info.c
index 005a2c4..f6e0b74 100644
--- a/info.c
+++ b/info.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/info.c,v 1.6 2001/12/14 20:02:25 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/info.c,v 1.5 2001/01/17 23:46:28 dawes Exp $ */
 
 #include "xsm.h"
 #include "restart.h"
diff --git a/info.h b/info.h
index 0d3e786..c07f404 100644
--- a/info.h
+++ b/info.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/info.h,v 3.5 2001/12/14 20:02:25 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/info.h,v 3.4 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _INFO_H_
 #define _INFO_H_
diff --git a/list.h b/list.h
index e0a1198..704a57c 100644
--- a/list.h
+++ b/list.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/list.h,v 1.6 2001/12/14 20:02:25 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/list.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _LIST_H_
 #define _LIST_H_
diff --git a/lock.c b/lock.c
index 611acdd..f4d3848 100644
--- a/lock.c
+++ b/lock.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/lock.c,v 3.5 2002/05/31 18:46:14 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/lock.c,v 3.4 2001/12/14 20:02:25 dawes Exp $ */
 
 #include "xsm.h"
 #include "lock.h"
diff --git a/lock.h b/lock.h
index 9e3af89..19805ef 100644
--- a/lock.h
+++ b/lock.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/lock.h,v 1.6 2001/12/14 20:02:25 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/lock.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _LOCK_H_
 #define _LOCK_H_
diff --git a/log.c b/log.c
index 7889bc2..179f55f 100644
--- a/log.c
+++ b/log.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/log.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/log.c,v 1.4 2001/01/17 23:46:29 dawes Exp $ */
 
 #include "xsm.h"
 #include "save.h"
diff --git a/log.h b/log.h
index 070a422..d1f68f9 100644
--- a/log.h
+++ b/log.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/log.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/log.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _LOG_H_
 #define _LOG_H_
diff --git a/mainwin.c b/mainwin.c
index b60de6e..ef7a96d 100644
--- a/mainwin.c
+++ b/mainwin.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/mainwin.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/mainwin.c,v 1.4 2001/01/17 23:46:29 dawes Exp $ */
 
 #include "xsm.h"
 #include "info.h"
diff --git a/mainwin.h b/mainwin.h
index 98df23e..3613162 100644
--- a/mainwin.h
+++ b/mainwin.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/mainwin.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/mainwin.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _MAINWIN_H_
 #define _MAINWIN_H_
diff --git a/misc.c b/misc.c
index 475ee87..73649cf 100644
--- a/misc.c
+++ b/misc.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/misc.c,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/misc.c,v 1.5 2001/07/25 15:05:29 dawes Exp $ */
 
 #include "xsm.h"
 
diff --git a/popup.c b/popup.c
index 90c21b5..e03ac88 100644
--- a/popup.c
+++ b/popup.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xsm/popup.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/popup.c,v 1.4 2001/01/17 23:46:30 dawes Exp $ */
 
 #include "xsm.h"
 #include <X11/Shell.h>
diff --git a/popup.h b/popup.h
index 7d5568d..5bb8181 100644
--- a/popup.h
+++ b/popup.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xsm/popup.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/popup.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _POPUP_H_
 #define _POPUP_H_
diff --git a/prop.c b/prop.c
index 18b9551..2e0958d 100644
--- a/prop.c
+++ b/prop.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/prop.c,v 1.6 2003/03/26 20:44:00 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/prop.c,v 1.5tsi Exp $ */
 
 #include "xsm.h"
 #include "info.h"
diff --git a/prop.h b/prop.h
index a124879..6bddc01 100644
--- a/prop.h
+++ b/prop.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/prop.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/prop.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _PROP_H_
 #define _PROP_H_
diff --git a/remote.c b/remote.c
index 5e942e7..f161f96 100644
--- a/remote.c
+++ b/remote.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/remote.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/remote.c,v 1.4 2001/01/17 23:46:30 dawes Exp $ */
 
 /*
  * We use the rstart protocol to restart clients on remote machines.
diff --git a/restart.c b/restart.c
index 581a0d4..896d8d4 100644
--- a/restart.c
+++ b/restart.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/restart.c,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/restart.c,v 1.5 2001/01/17 23:46:30 dawes Exp $ */
 
 #include "xsm.h"
 #include "log.h"
diff --git a/restart.h b/restart.h
index a1abc89..e2f6b54 100644
--- a/restart.h
+++ b/restart.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/restart.h,v 1.6 2001/12/14 20:02:27 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/restart.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _RESTART_H_
 #define _RESTART_H_
diff --git a/save.c b/save.c
index bc7bc0e..5d06877 100644
--- a/save.c
+++ b/save.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/save.c,v 3.4 2001/12/14 20:02:27 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/save.c,v 3.3 2001/01/17 23:46:30 dawes Exp $ */
 
 #include "xsm.h"
 #include "save.h"
diff --git a/save.h b/save.h
index 5c76e56..5357d32 100644
--- a/save.h
+++ b/save.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/save.h,v 1.6 2001/12/14 20:02:27 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/save.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _SAVE_H_
 #define _SAVE_H_
diff --git a/saveutil.c b/saveutil.c
index 2e604c8..0e81785 100644
--- a/saveutil.c
+++ b/saveutil.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/saveutil.c,v 1.6 2001/12/14 20:02:27 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/saveutil.c,v 1.5 2001/01/17 23:46:31 dawes Exp $ */
 
 #include "xsm.h"
 #include "log.h"
diff --git a/saveutil.h b/saveutil.h
index 86a040a..31af135 100644
--- a/saveutil.h
+++ b/saveutil.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/saveutil.h,v 1.7 2001/12/14 20:02:27 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/saveutil.h,v 1.6 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _SAVEUTIL_H_
 #define _SAVEUTIL_H_
diff --git a/signals.c b/signals.c
index 7c2a2e7..9be9bab 100644
--- a/signals.c
+++ b/signals.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/signals.c,v 3.6 2001/12/14 20:02:27 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/signals.c,v 3.5 2001/12/08 18:33:45 herrb Exp $ */
 
 #include <stdlib.h>
 
diff --git a/xsm.c b/xsm.c
index 47fdced..15304ba 100644
--- a/xsm.c
+++ b/xsm.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/xsm.c,v 1.10 2003/09/13 21:33:12 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/xsm.c,v 1.9 2001/12/14 20:02:27 dawes Exp $ */
 
 /*
  * X Session Manager.
diff --git a/xsm.h b/xsm.h
index 5315373..3a25d7b 100644
--- a/xsm.h
+++ b/xsm.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/xsm.h,v 1.8 2001/12/14 20:02:27 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/xsm.h,v 1.7 2001/12/08 18:33:45 herrb Exp $ */
 
 #ifndef _XSM_H_
 #define _XSM_H_
diff --git a/xsm.man b/xsm.man
index 8b0ebb2..29696aa 100644
--- a/xsm.man
+++ b/xsm.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xsm/xsm.man,v 1.7 2001/12/14 20:02:28 dawes Exp $
+.\" $XFree86: xc/programs/xsm/xsm.man,v 1.6 2001/01/27 18:21:24 dawes Exp $
 .\"
 .TH XSM 1 __xorgversion__
 .SH NAME
diff --git a/xtwatch.c b/xtwatch.c
index 4dd1050..7aa7d19 100644
--- a/xtwatch.c
+++ b/xtwatch.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/xtwatch.c,v 1.5 2001/12/14 20:02:28 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/xtwatch.c,v 1.4 2001/01/17 23:46:31 dawes Exp $ */
 
 #include <X11/ICE/ICElib.h>
 #include <X11/Intrinsic.h>
diff --git a/xtwatch.h b/xtwatch.h
index 8ad0b04..e6a73e2 100644
--- a/xtwatch.h
+++ b/xtwatch.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xsm/xtwatch.h,v 1.6 2001/12/14 20:02:28 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/xtwatch.h,v 1.5 2001/08/01 00:45:07 tsi Exp $ */
 
 #ifndef _XTWATCH_H_
 #define _XTWATCH_H_
-- 
cgit v1.2.3