From b2fec4bfd950c450c774543b3336e1beb0bd9aa1 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:55:06 +0000
Subject: Merging XORG-CURRENT into trunk

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

(limited to 'popup.c')

diff --git a/popup.c b/popup.c
index 90c21b5..e03ac88 100644
--- a/popup.c
+++ b/popup.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xsm/popup.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/xsm/popup.c,v 1.4 2001/01/17 23:46:30 dawes Exp $ */
 
 #include "xsm.h"
 #include <X11/Shell.h>
-- 
cgit v1.2.3