Merging XORG-CURRENT into trunk

2 files changed, 2 insertions, 2 deletions

diff --git a/xset.c b/xset.c
index 53bb0a6..27c3914 100644
--- a/xset.c
+++ b/xset.c
@@ -27,7 +27,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/xset/xset.c,v 3.32 2003/09/24 02:43:39 dawes Exp $ */
+/* $XFree86: xc/programs/xset/xset.c,v 3.31 2003/05/27 22:27:09 tsi Exp $ */
 /* Modified by Stephen so keyboard rate is set using XKB extensions */
 
 #include <stdio.h>
diff --git a/xset.man b/xset.man
index 2e94f2c..86466c3 100644
--- a/xset.man
+++ b/xset.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\" 
-.\" $XFree86: xc/programs/xset/xset.man,v 3.15 2002/11/12 23:53:35 dawes Exp $
+.\" $XFree86: xc/programs/xset/xset.man,v 3.14 2001/12/14 20:02:22 dawes Exp $
 .\" 
 .TH XSET 1 __xorgversion__
 .SH NAME