From 495c71ddaaeeebab3efe7d3d73d7c5168e3803c5 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 18:43:06 +0000
Subject: Merging XORG-CURRENT into trunk

---
 xf86misc.h   | 2 +-
 xf86mscstr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xf86misc.h b/xf86misc.h
index ba1db79..f5d7a56 100644
--- a/xf86misc.h
+++ b/xf86misc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86misc.h,v 3.17 2003/04/03 16:15:46 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */
 
 /*
  * Copyright (c) 1995, 1996  The XFree86 Project, Inc
diff --git a/xf86mscstr.h b/xf86mscstr.h
index e514740..4e527b8 100644
--- a/xf86mscstr.h
+++ b/xf86mscstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.13 2003/04/03 16:15:46 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */
 
 /*
  * Copyright (c) 1995, 1996  The XFree86 Project, Inc
-- 
cgit v1.2.3