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)

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

(limited to 'svpopup.c')

diff --git a/svpopup.c b/svpopup.c
index cccfee0..8affe88 100644
--- a/svpopup.c
+++ b/svpopup.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Chris D. Peterson, MIT X Consortium
  */
-/* $XFree86: xc/programs/editres/svpopup.c,v 1.6 2001/12/14 20:00:43 dawes Exp $ */
+/* $XFree86: xc/programs/editres/svpopup.c,v 1.5 2001/01/17 23:44:52 dawes Exp $ */
 
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>	/* Get standard string definations. */
-- 
cgit v1.2.3