From b16fb21849e055327d1d106c5277f4a34875e18b Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 4 Mar 2004 17:46:24 +0000
Subject: 18. Merged in XFree86 code up to 4.4.0 including changes to files
 that had     a changed license. There was only one change which happened to
 be from     me (Egbert Eich).

---
 XKB.h     | 2 +-
 XKBgeom.h | 2 +-
 XKBsrv.h  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/XKB.h b/XKB.h
index 59ccc7d..d0d13f2 100644
--- a/XKB.h
+++ b/XKB.h
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/include/extensions/XKB.h,v 1.6 2003/12/22 17:48:02 tsi Exp $ */
+/* $XFree86: xc/include/extensions/XKB.h,v 1.5tsi Exp $ */
 
 #ifndef _XKB_H_
 #define	_XKB_H_
diff --git a/XKBgeom.h b/XKBgeom.h
index f8f7e31..89f902f 100644
--- a/XKBgeom.h
+++ b/XKBgeom.h
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.10 2003/11/17 22:20:02 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.9 2002/09/18 17:11:40 tsi Exp $ */
 
 #ifndef _XKBGEOM_H_
 #define	_XKBGEOM_H_
diff --git a/XKBsrv.h b/XKBsrv.h
index bfbc7bc..3376d39 100644
--- a/XKBsrv.h
+++ b/XKBsrv.h
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.23 2003/11/17 22:20:02 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.22 2002/11/20 04:49:01 dawes Exp $ */
 
 #ifndef _XKBSRV_H_
 #define	_XKBSRV_H_
-- 
cgit v1.2.1