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

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

(limited to 'xprop.c')

diff --git a/xprop.c b/xprop.c
index 56dbdf9..3a9fe5d 100644
--- a/xprop.c
+++ b/xprop.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xprop/xprop.c,v 1.16 2003/10/31 21:49:48 herrb Exp $ */
+/* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */
 
 
 #include <X11/Xlib.h>
-- 
cgit v1.2.3