Merging XORG-CURRENT into trunk

Change-Id: I7409651c1e5db298956f11863451e8811a23ab3f

diff --git a/xev.c b/xev.c
index 5d755ea..1622fe5 100644 (file)
--- a/xev.c
+++ b/xev.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xev/xev.c,v 1.14 2004/02/07 04:33:07 dawes Exp $ */
+/* $XFree86: xc/programs/xev/xev.c,v 1.13 2003/10/24 20:38:17 tsi Exp $ */
 
 /*
  * Author:  Jim Fulton, MIT X Consortium

diff --git a/xev.man b/xev.man
index e4c29a0..dcb1e3a 100644 (file)
--- a/xev.man
+++ b/xev.man
@@ -1,6 +1,6 @@
 .\" $XConsortium: xev.man,v 1.10 94/04/17 20:45:20 gildea Exp $
 .\"
-.\" $XFree86: xc/programs/xev/xev.man,v 1.4 2003/05/24 15:49:02 herrb Exp $
+.\" $XFree86: xc/programs/xev/xev.man,v 1.3 2001/01/27 18:21:11 dawes Exp $
 .\"
 .TH XEV 1 __xorgversion__
 .SH NAME