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

---
 editresP.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'editresP.h')

diff --git a/editresP.h b/editresP.h
index 8973fff..0719511 100644
--- a/editresP.h
+++ b/editresP.h
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Chris D. Peterson, MIT X Consortium
  */
-/* $XFree86: xc/programs/editres/editresP.h,v 1.7 2001/12/14 20:00:42 dawes Exp $ */
+/* $XFree86: xc/programs/editres/editresP.h,v 1.6 2001/07/25 15:05:13 dawes Exp $ */
 
 #include <X11/Xmu/EditresP.h>
 #include <X11/Xresource.h>
-- 
cgit v1.2.3