Merging XORG-CURRENT into trunk

Change-Id: I328d9908a5eafe484f78ed72708002e4eb31ddfa

diff --git a/dsimple.c b/dsimple.c
index cd4cbc9..8cdce02 100644 (file)
--- a/dsimple.c
+++ b/dsimple.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.7 2003/09/24 02:43:38 dawes Exp $ */
+/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.6 2001/12/14 20:02:09 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xlib.h>

diff --git a/dsimple.h b/dsimple.h
index 7efd5c0..ae520aa 100644 (file)
--- a/dsimple.h
+++ b/dsimple.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.9 2003/11/17 22:20:54 dawes Exp $ */
+/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.8 2002/12/24 17:43:01 tsi Exp $ */
 
 /*
  * Just_display.h: This file contains the definitions needed to use the

diff --git a/list.c b/list.c
index 1366617..c5ea6c8 100644 (file)
--- a/list.c
+++ b/list.c
@@ -34,7 +34,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
   ----------------------------------------------------------------------- **/
-/* $XFree86: xc/programs/xwd/list.c,v 3.7 2003/11/17 22:20:54 dawes Exp $ */
+/* $XFree86: xc/programs/xwd/list.c,v 3.6 2001/12/14 20:02:33 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/list.h b/list.h
index cbb4dbe..ad8199b 100644 (file)
--- a/list.h
+++ b/list.h
@@ -34,7 +34,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
     -------------------------------------------------------------------- **/
-/* $XFree86: xc/programs/xwd/list.h,v 1.6 2003/11/17 22:20:54 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef LIST_DEF
 #define LIST_DEF

diff --git a/multiVis.c b/multiVis.c
index 5f3559f..e5ed2c7 100644 (file)
--- a/multiVis.c
+++ b/multiVis.c
@@ -34,7 +34,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
     ------------------------------------------------------------------------ **/
-/* $XFree86: xc/programs/xwd/multiVis.c,v 1.10 2003/11/17 22:20:54 dawes Exp $ */
+/* $XFree86: xc/programs/xwd/multiVis.c,v 1.9 2003/05/27 22:27:14 tsi Exp $ */
 
 #include <stdlib.h>
 #include <X11/Xlib.h>

diff --git a/multiVis.h b/multiVis.h
index 5fdd147..8a4682f 100644 (file)
--- a/multiVis.h
+++ b/multiVis.h
@@ -34,7 +34,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
  ------------------------------------------------------------------------ **/
-/* $XFree86: xc/programs/xwd/multiVis.h,v 1.3 2003/11/17 22:20:54 dawes Exp $ */
+/* $XFree86$ */
 
 extern int GetMultiVisualRegions(
     Display *, Window, int, int, unsigned int,

diff --git a/wsutils.h b/wsutils.h
index ab4b211..4d84ad0 100644 (file)
--- a/wsutils.h
+++ b/wsutils.h
@@ -34,7 +34,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
     ------------------------------------------------------------------------ **/
-/* $XFree86: xc/programs/xwd/wsutils.h,v 1.3 2003/11/17 22:20:54 dawes Exp $ */
+/* $XFree86$ */
 
 /******************************************************************************
  *

diff --git a/xwd.c b/xwd.c
index 426e111..82d43ef 100644 (file)
--- a/xwd.c
+++ b/xwd.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/xwd/xwd.c,v 3.12 2002/09/19 00:19:56 dawes Exp $ */
+/* $XFree86: xc/programs/xwd/xwd.c,v 3.11 2002/09/16 18:06:21 eich Exp $ */
 
 /*
  * xwd.c MIT Project Athena, X Window system window raster image dumper.

diff --git a/xwd.man b/xwd.man
index 13b4735..ea1bb60 100644 (file)
--- a/xwd.man
+++ b/xwd.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xwd/xwd.man,v 1.9 2002/04/22 20:53:10 herrb Exp $
+.\" $XFree86: xwd.man,v 1.8 2001/12/14 20:02:34 dawes Exp $
 .\"
 .TH XWD 1 __xorgversion__
 .SH NAME