From 3b8859eca5103b50149e0274182cf55d80ec7909 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

---
 randr.h      | 2 +-
 randrproto.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/randr.h b/randr.h
index 9ff39c0..af3e4ed 100644
--- a/randr.h
+++ b/randr.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/include/extensions/randr.h,v 1.6 2002/10/14 18:01:38 keithp Exp $
+ * $XFree86: xc/include/extensions/randr.h,v 1.4 2001/11/24 07:24:58 keithp Exp $
  *
  * Copyright © 2000, Compaq Computer Corporation, 
  * Copyright © 2002, Hewlett Packard, Inc.
diff --git a/randrproto.h b/randrproto.h
index 6f06b52..a28358f 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/include/extensions/randrproto.h,v 1.8 2002/10/14 18:01:38 keithp Exp $
+ * $XFree86: xc/include/extensions/randrproto.h,v 1.6 2002/09/29 23:39:43 keithp Exp $
  *
  * Copyright © 2000 Compaq Computer Corporation
  * Copyright © 2002 Hewlett-Packard Company
-- 
cgit v1.2.1