summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-14 08:35:46 +0000
committerEgbert Eich <eich@suse.de>2004-03-14 08:35:46 +0000
commit1233b543cac3b9c1a6155042c4ff73a4b0b73293 (patch)
tree7c2e3e88ae0d077675f3263526e92dfcf5b4f35e
parentba8059df1be266090f17a4877a2fe28818ee511a (diff)
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004xf86-4_4_99_1
-rw-r--r--auth.c2
-rw-r--r--auth.h2
-rw-r--r--choose.c2
-rw-r--r--choose.h2
-rw-r--r--globals.c2
-rw-r--r--info.c2
-rw-r--r--info.h2
-rw-r--r--list.h2
-rw-r--r--lock.c2
-rw-r--r--lock.h2
-rw-r--r--log.c2
-rw-r--r--log.h2
-rw-r--r--mainwin.c2
-rw-r--r--mainwin.h2
-rw-r--r--misc.c2
-rw-r--r--popup.c2
-rw-r--r--popup.h2
-rw-r--r--prop.c2
-rw-r--r--prop.h2
-rw-r--r--remote.c2
-rw-r--r--restart.c2
-rw-r--r--restart.h2
-rw-r--r--save.c2
-rw-r--r--save.h2
-rw-r--r--saveutil.c2
-rw-r--r--saveutil.h2
-rw-r--r--signals.c2
-rw-r--r--xsm.c2
-rw-r--r--xsm.h2
-rw-r--r--xsm.man2
-rw-r--r--xtwatch.c2
-rw-r--r--xtwatch.h2
32 files changed, 32 insertions, 32 deletions
diff --git a/auth.c b/auth.c
index 67f0eca..4eb594a 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.6 2001/01/17 23:46:28 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/auth.c,v 1.7 2001/12/14 20:02:23 dawes Exp $ */
#include "xsm.h"
diff --git a/auth.h b/auth.h
index 9e8cec6..2302dbb 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.5 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/auth.h,v 1.6 2001/12/14 20:02:23 dawes Exp $ */
#ifndef _AUTH_H_
#define _AUTH_H_
diff --git a/choose.c b/choose.c
index e1711f9..8abee3f 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.6tsi Exp $ */
+/* $XFree86: xc/programs/xsm/choose.c,v 1.7 2003/07/20 16:12:21 tsi Exp $ */
#include "xsm.h"
#include "saveutil.h"
diff --git a/choose.h b/choose.h
index 5206338..31dc9ca 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.5 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/choose.h,v 1.6 2001/12/14 20:02:24 dawes Exp $ */
#ifndef _CHOOSE_H_
#define _CHOOSE_H_
diff --git a/globals.c b/globals.c
index 2d917d9..5bbbc44 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.5 2001/12/08 18:33:45 herrb Exp $ */
+/* $XFree86: xc/programs/xsm/globals.c,v 1.6 2001/12/14 20:02:25 dawes Exp $ */
#include <X11/ICE/ICEutil.h>
diff --git a/info.c b/info.c
index f6e0b74..005a2c4 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.5 2001/01/17 23:46:28 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/info.c,v 1.6 2001/12/14 20:02:25 dawes Exp $ */
#include "xsm.h"
#include "restart.h"
diff --git a/info.h b/info.h
index c07f404..0d3e786 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.4 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/info.h,v 3.5 2001/12/14 20:02:25 dawes Exp $ */
#ifndef _INFO_H_
#define _INFO_H_
diff --git a/list.h b/list.h
index 704a57c..e0a1198 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.5 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/list.h,v 1.6 2001/12/14 20:02:25 dawes Exp $ */
#ifndef _LIST_H_
#define _LIST_H_
diff --git a/lock.c b/lock.c
index f4d3848..611acdd 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.4 2001/12/14 20:02:25 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/lock.c,v 3.5 2002/05/31 18:46:14 dawes Exp $ */
#include "xsm.h"
#include "lock.h"
diff --git a/lock.h b/lock.h
index 19805ef..9e3af89 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.5 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/lock.h,v 1.6 2001/12/14 20:02:25 dawes Exp $ */
#ifndef _LOCK_H_
#define _LOCK_H_
diff --git a/log.c b/log.c
index 179f55f..7889bc2 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.4 2001/01/17 23:46:29 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/log.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */
#include "xsm.h"
#include "save.h"
diff --git a/log.h b/log.h
index d1f68f9..070a422 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.5 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/log.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
#ifndef _LOG_H_
#define _LOG_H_
diff --git a/mainwin.c b/mainwin.c
index ef7a96d..b60de6e 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.4 2001/01/17 23:46:29 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/mainwin.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */
#include "xsm.h"
#include "info.h"
diff --git a/mainwin.h b/mainwin.h
index 3613162..98df23e 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.5 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/mainwin.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
#ifndef _MAINWIN_H_
#define _MAINWIN_H_
diff --git a/misc.c b/misc.c
index 73649cf..475ee87 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.5 2001/07/25 15:05:29 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/misc.c,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
#include "xsm.h"
diff --git a/popup.c b/popup.c
index e03ac88..90c21b5 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.4 2001/01/17 23:46:30 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/popup.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */
#include "xsm.h"
#include <X11/Shell.h>
diff --git a/popup.h b/popup.h
index 5bb8181..7d5568d 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.5 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/popup.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
#ifndef _POPUP_H_
#define _POPUP_H_
diff --git a/prop.c b/prop.c
index 2e0958d..18b9551 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.5tsi Exp $ */
+/* $XFree86: xc/programs/xsm/prop.c,v 1.6 2003/03/26 20:44:00 tsi Exp $ */
#include "xsm.h"
#include "info.h"
diff --git a/prop.h b/prop.h
index 6bddc01..a124879 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.5 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/prop.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
#ifndef _PROP_H_
#define _PROP_H_
diff --git a/remote.c b/remote.c
index f161f96..5e942e7 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.4 2001/01/17 23:46:30 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/remote.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */
/*
* We use the rstart protocol to restart clients on remote machines.
diff --git a/restart.c b/restart.c
index 896d8d4..581a0d4 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.5 2001/01/17 23:46:30 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/restart.c,v 1.6 2001/12/14 20:02:26 dawes Exp $ */
#include "xsm.h"
#include "log.h"
diff --git a/restart.h b/restart.h
index e2f6b54..a1abc89 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.5 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/restart.h,v 1.6 2001/12/14 20:02:27 dawes Exp $ */
#ifndef _RESTART_H_
#define _RESTART_H_
diff --git a/save.c b/save.c
index 5d06877..bc7bc0e 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.3 2001/01/17 23:46:30 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/save.c,v 3.4 2001/12/14 20:02:27 dawes Exp $ */
#include "xsm.h"
#include "save.h"
diff --git a/save.h b/save.h
index 5357d32..5c76e56 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.5 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/save.h,v 1.6 2001/12/14 20:02:27 dawes Exp $ */
#ifndef _SAVE_H_
#define _SAVE_H_
diff --git a/saveutil.c b/saveutil.c
index 0e81785..2e604c8 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.5 2001/01/17 23:46:31 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/saveutil.c,v 1.6 2001/12/14 20:02:27 dawes Exp $ */
#include "xsm.h"
#include "log.h"
diff --git a/saveutil.h b/saveutil.h
index 31af135..86a040a 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.6 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/saveutil.h,v 1.7 2001/12/14 20:02:27 dawes Exp $ */
#ifndef _SAVEUTIL_H_
#define _SAVEUTIL_H_
diff --git a/signals.c b/signals.c
index 9be9bab..7c2a2e7 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.5 2001/12/08 18:33:45 herrb Exp $ */
+/* $XFree86: xc/programs/xsm/signals.c,v 3.6 2001/12/14 20:02:27 dawes Exp $ */
#include <stdlib.h>
diff --git a/xsm.c b/xsm.c
index 15304ba..47fdced 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.9 2001/12/14 20:02:27 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/xsm.c,v 1.10 2003/09/13 21:33:12 dawes Exp $ */
/*
* X Session Manager.
diff --git a/xsm.h b/xsm.h
index 3a25d7b..5315373 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.7 2001/12/08 18:33:45 herrb Exp $ */
+/* $XFree86: xc/programs/xsm/xsm.h,v 1.8 2001/12/14 20:02:27 dawes Exp $ */
#ifndef _XSM_H_
#define _XSM_H_
diff --git a/xsm.man b/xsm.man
index 29696aa..8b0ebb2 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.6 2001/01/27 18:21:24 dawes Exp $
+.\" $XFree86: xc/programs/xsm/xsm.man,v 1.7 2001/12/14 20:02:28 dawes Exp $
.\"
.TH XSM 1 __xorgversion__
.SH NAME
diff --git a/xtwatch.c b/xtwatch.c
index 7aa7d19..4dd1050 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.4 2001/01/17 23:46:31 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/xtwatch.c,v 1.5 2001/12/14 20:02:28 dawes Exp $ */
#include <X11/ICE/ICElib.h>
#include <X11/Intrinsic.h>
diff --git a/xtwatch.h b/xtwatch.h
index e6a73e2..8ad0b04 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.5 2001/08/01 00:45:07 tsi Exp $ */
+/* $XFree86: xc/programs/xsm/xtwatch.h,v 1.6 2001/12/14 20:02:28 dawes Exp $ */
#ifndef _XTWATCH_H_
#define _XTWATCH_H_