From bb493442b65c30915eebd18eaa73c7229efe5b09 Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed, 17 Mar 2004 20:32:52 +0000
Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)

---
 startx.cmd  | 2 +-
 startx.cpp  | 2 +-
 startx.man  | 2 +-
 xinit.c     | 2 +-
 xinit.def   | 2 +-
 xinit.man   | 2 +-
 xinitrc.cmd | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/startx.cmd b/startx.cmd
index 4b4e712..fd19ef4 100644
--- a/startx.cmd
+++ b/startx.cmd
@@ -1,5 +1,5 @@
 /* OS/2 REXX */
-/* $XFree86: xc/programs/xinit/startx.cmd,v 3.4 2003/11/12 00:10:31 dawes Exp $
+/* $XFree86: xc/programs/xinit/startx.cmd,v 3.3 1996/10/17 15:23:47 dawes Exp $
  * 
  * This is just a sample implementation of a slightly less primitive 
  * interface than xinit.  It looks for user xinitrc.cmd and xservrc.cmd
diff --git a/startx.cpp b/startx.cpp
index aed51b2..2f66cb8 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -11,7 +11,7 @@ XCOMM and pop a clock and serveral xterms.
 XCOMM
 XCOMM Site administrators are STRONGLY urged to write nicer versions.
 XCOMM
-XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.18 2003/08/22 19:27:33 eich Exp $
+XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $
 
 #ifdef SCO
 
diff --git a/startx.man b/startx.man
index 4b14a05..e3898de 100644
--- a/startx.man
+++ b/startx.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xinit/startx.man,v 1.8 2001/12/14 20:01:56 dawes Exp $
+.\" $XFree86: xc/programs/xinit/startx.man,v 1.7 2001/04/19 15:08:32 dawes Exp $
 .\"
 .TH STARTX 1 __xorgversion__
 .SH NAME
diff --git a/xinit.c b/xinit.c
index 62cf248..a2384f2 100644
--- a/xinit.c
+++ b/xinit.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/programs/xinit/xinit.c,v 3.33 2003/06/10 17:03:56 dawes Exp $ */
+/* $XFree86: xc/programs/xinit/xinit.c,v 3.32 2002/05/31 18:46:13 dawes Exp $ */
 
 #include <X11/Xlib.h>
 #include <X11/Xos.h>
diff --git a/xinit.def b/xinit.def
index a3273c6..92c4176 100644
--- a/xinit.def
+++ b/xinit.def
@@ -1,4 +1,4 @@
 NAME xinit NOTWINDOWCOMPAT
-DESCRIPTION "@#XFREE86:4.2.0#@ $XFree86: xc/programs/xinit/xinit.def,v 3.2 2002/05/31 18:46:13 dawes Exp $"
+DESCRIPTION "@#XFREE86:4.4.0#@ $XFree86: xc/programs/xinit/xinit.def,v 3.2 2002/05/31 18:46:13 dawes Exp $"
 PROTMODE
 EXETYPE OS2
diff --git a/xinit.man b/xinit.man
index ecf7353..2ff692c 100644
--- a/xinit.man
+++ b/xinit.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\" 
-.\" $XFree86: xc/programs/xinit/xinit.man,v 3.10 2001/12/14 20:01:56 dawes Exp $
+.\" $XFree86: xc/programs/xinit/xinit.man,v 3.9 2001/02/07 23:25:56 dawes Exp $
 .\" 
 .TH XINIT 1 __xorgversion__
 .SH NAME
diff --git a/xinitrc.cmd b/xinitrc.cmd
index 5a3a991..a4502b8 100644
--- a/xinitrc.cmd
+++ b/xinitrc.cmd
@@ -1,5 +1,5 @@
 /* OS/2 REXX */
-/* $XFree86: xc/programs/xinit/xinitrc.cmd,v 3.6 2003/11/12 00:10:31 dawes Exp $ */
+/* $XFree86: xc/programs/xinit/xinitrc.cmd,v 3.5 1997/01/27 08:26:14 dawes Exp $ */
 '@echo off'
 env = 'OS2ENVIRONMENT'
 x11root = VALUE('X11ROOT',,env)
-- 
cgit v1.2.3