From 0748aa1ae39c980ddb1187ecdfc2207facf2e389 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

---
 xf86vmode.h | 2 +-
 xf86vmstr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xf86vmode.h b/xf86vmode.h
index 99e6323..3420ae4 100644
--- a/xf86vmode.h
+++ b/xf86vmode.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.31 2002/12/22 00:46:50 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.30 2001/05/07 20:09:50 mvojkovi Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
diff --git a/xf86vmstr.h b/xf86vmstr.h
index db6f6e6..a80eb8e 100644
--- a/xf86vmstr.h
+++ b/xf86vmstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.28 2002/12/22 00:46:50 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.27 2001/08/01 00:44:36 tsi Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
-- 
cgit v1.2.1