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

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

diff --git a/XResproto.h b/XResproto.h
index 754b502..2f5563b 100644
--- a/XResproto.h
+++ b/XResproto.h
@@ -1,7 +1,7 @@
 /*
    Copyright (c) 2002  XFree86 Inc
 */
-/* $XFree86: xc/include/extensions/XResproto.h,v 1.2 2002/03/10 22:05:51 mvojkovi Exp $ */
+/* $XFree86: xc/include/extensions/XResproto.h,v 1.1 2002/03/04 19:31:35 mvojkovi Exp $ */
 
 #ifndef _XRESPROTO_H
 #define _XRESPROTO_H
-- 
cgit v1.2.1