Merging XORG-CURRENT into trunk

Change-Id: I0a6fa69cff6fb455acffd77bf5b91e16e2eb6ec7

diff --git a/xwud.c b/xwud.c
index b0e911a..1475f06 100644 (file)
--- a/xwud.c
+++ b/xwud.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xwud/xwud.c,v 3.11 2003/11/17 15:18:08 tsi Exp $ */
+/* $XFree86: xc/programs/xwud/xwud.c,v 3.10tsi Exp $ */
 
 /* xwud - marginally useful raster image undumper */
 

diff --git a/xwud.man b/xwud.man
index 23877cf..f0e2923 100644 (file)
--- a/xwud.man
+++ b/xwud.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xwud/xwud.man,v 1.10 2003/11/15 02:40:28 dawes Exp $
+.\" $XFree86: xc/programs/xwud/xwud.man,v 1.9 2002/04/22 20:53:11 herrb Exp $
 .\"
 .TH XWUD 1 __xorgversion__
 .SH NAME