From 7557e2f322edf30bb86f3a28973b3acd23763f94 Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed, 17 Mar 2004 20:32:21 +0000
Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)

---
 setxkbmap.c   | 2 +-
 setxkbmap.man | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setxkbmap.c b/setxkbmap.c
index 16d12bf..eb81cba 100644
--- a/setxkbmap.c
+++ b/setxkbmap.c
@@ -23,7 +23,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/setxkbmap/setxkbmap.c,v 3.8 2003/11/17 22:20:50 dawes Exp $ */
+/* $XFree86: xc/programs/setxkbmap/setxkbmap.c,v 3.7 2003/01/20 04:15:08 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/setxkbmap.man b/setxkbmap.man
index 44625ed..c21eca6 100644
--- a/setxkbmap.man
+++ b/setxkbmap.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/programs/setxkbmap/setxkbmap.man,v 3.7 2003/05/29 22:16:23 herrb Exp $
+.\" $XFree86: xc/programs/setxkbmap/setxkbmap.man,v 3.6 2003/01/20 04:15:08 dawes Exp $
 .\"
 .TH SETXKBMAP 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3