Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004xf86-4_4_99_1

12 files changed, 12 insertions, 12 deletions

diff --git a/os/access.c b/os/access.c
index c500728..83103da 100644
--- a/os/access.c
+++ b/os/access.c
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/os/access.c,v 3.7tsi Exp $ */
+/* $XFree86: xc/programs/xfs/os/access.c,v 3.8 2003/07/09 15:27:40 tsi Exp $ */
 
 #include	<X11/Xos.h>
 #ifndef Lynx
diff --git a/os/config.c b/os/config.c
index 795455b..64f8992 100644
--- a/os/config.c
+++ b/os/config.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * $NCDXorg: @(#)config.c,v 4.6 1991/07/09 14:08:09 lemke Exp $
  *
  */
-/* $XFree86: xc/programs/xfs/os/config.c,v 3.15 2002/05/31 18:46:12 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/config.c,v 3.16 2002/10/15 01:45:03 dawes Exp $ */
 
 #include	<stdio.h>
 #include	<stdlib.h>
diff --git a/os/configstr.h b/os/configstr.h
index 9c1a8af..9000acc 100644
--- a/os/configstr.h
+++ b/os/configstr.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)configstr.h	4.1	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/os/configstr.h,v 1.4 2001/01/17 23:45:32 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/configstr.h,v 1.5 2001/12/14 20:01:41 dawes Exp $ */
 #ifndef _CONFIGSTR_H_
 #define _CONFIGSTR_H_
 #include	"config.h"
diff --git a/os/connection.c b/os/connection.c
index 5d17773..d17de6d 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -67,7 +67,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/os/connection.c,v 3.25tsi Exp $ */
+/* $XFree86: xc/programs/xfs/os/connection.c,v 3.26 2003/07/09 15:27:40 tsi Exp $ */
 
 #include	<stdlib.h>
 #include	<X11/Xtrans.h>
diff --git a/os/daemon.c b/os/daemon.c
index 2b23de3..658965e 100644
--- a/os/daemon.c
+++ b/os/daemon.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xfs/os/daemon.c,v 1.12 2002/10/20 21:42:50 tsi Exp $ */
+/* $XFree86: xc/programs/xfs/os/daemon.c,v 1.13 2004/01/07 03:47:36 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <sys/types.h>
diff --git a/os/error.c b/os/error.c
index 3d21b10..20b877c 100644
--- a/os/error.c
+++ b/os/error.c
@@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: error.c,v 1.11 2002/10/15 01:45:03 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/error.c,v 1.12 2004/01/28 22:12:49 herrb Exp $ */
 
 #include	<stdio.h>
 #include	<stdlib.h>
diff --git a/os/io.c b/os/io.c
index 80b89e5..4345907 100644
--- a/os/io.c
+++ b/os/io.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/os/io.c,v 3.18 2001/12/14 20:01:41 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/io.c,v 3.19 2002/05/31 18:46:12 dawes Exp $ */
 
 #include	<X11/Xtrans.h>
 #include	<stdio.h>
diff --git a/os/osdep.h b/os/osdep.h
index e8bd527..ae3798b 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)osdep.h	4.1	5/2/91
  *
  */
-/* $XFree86: xc/programs/xfs/os/osdep.h,v 3.11 2001/12/14 20:01:41 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/osdep.h,v 3.12 2002/05/31 18:46:12 dawes Exp $ */
 
 #ifndef _OSDEP_H_
 #define	_OSDEP_H_
diff --git a/os/osglue.c b/os/osglue.c
index 6c1b1ac..67f784c 100644
--- a/os/osglue.c
+++ b/os/osglue.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  * $NCDXorg: @(#)osglue.c,v 4.6 1991/07/09 14:07:30 lemke Exp $
  *
  */
-/* $XFree86: xc/programs/xfs/os/osglue.c,v 3.18 2002/10/15 01:45:03 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/osglue.c,v 3.19 2002/10/19 20:04:20 herrb Exp $ */
 
 /*
  * this is miscellaneous OS specific stuff.
diff --git a/os/osinit.c b/os/osinit.c
index a12bb00..7d0a068 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
  * @(#)osinit.c	4.3	5/7/91
  *
  */
-/* $XFree86: xc/programs/xfs/os/osinit.c,v 1.4 2001/01/17 23:45:33 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/osinit.c,v 1.5 2001/12/14 20:01:41 dawes Exp $ */
 
 #include	"os.h"
 
diff --git a/os/utils.c b/os/utils.c
index fcc1c2a..c953306 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/os/utils.c,v 3.20 2002/10/15 01:45:03 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/utils.c,v 3.21 2004/01/07 03:47:36 dawes Exp $ */
 
 #include	<stdio.h>
 #include	<X11/Xos.h>
diff --git a/os/waitfor.c b/os/waitfor.c
index 09e30c8..8394e78 100644
--- a/os/waitfor.c
+++ b/os/waitfor.c
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
  * $NCDXorg: @(#)waitfor.c,v 4.5 1991/06/24 11:59:20 lemke Exp $
  *
  */
-/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.15 2001/12/14 20:01:41 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.16 2002/05/31 18:46:12 dawes Exp $ */
 
 #include	<X11/Xos.h>	/* strings, time, etc */