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)

---
 editres.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'editres.c')

diff --git a/editres.c b/editres.c
index 3a2c9b9..d8d436f 100644
--- a/editres.c
+++ b/editres.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
-/* $XFree86: xc/programs/editres/editres.c,v 1.7 2001/12/14 20:00:42 dawes Exp $ */
+/* $XFree86: xc/programs/editres/editres.c,v 1.6 2001/04/01 14:00:17 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
-- 
cgit v1.2.3