Merging XORG-CURRENT into trunk

diff --git a/xlsatoms.c b/xlsatoms.c
index 52b3dcd..5411611 100644 (file)
--- a/xlsatoms.c
+++ b/xlsatoms.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Jim Fulton, MIT X Consortium
  */
-/* $XFree86: xc/programs/xlsatoms/xlsatoms.c,v 1.6 2001/12/14 20:02:08 dawes Exp $ */
+/* $XFree86: xc/programs/xlsatoms/xlsatoms.c,v 1.5 2001/04/01 14:00:23 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/xlsatoms.man b/xlsatoms.man
index b6f9a69..3c3ebb6 100644 (file)
--- a/xlsatoms.man
+++ b/xlsatoms.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xlsatoms/xlsatoms.man,v 1.8 2001/12/14 20:02:08 dawes Exp $
+.\" $XFree86: xc/programs/xlsatoms/xlsatoms.man,v 1.7 2001/01/27 18:21:17 dawes Exp $
 .\"
 .TH XLSATOMS 1 __xorgversion__
 .SH NAME