From 2773a7214e282f6f673483f5233b880505947c3f Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 18:42:32 +0000
Subject: Merging XORG-CURRENT into trunk

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

(limited to 'cxpm')

diff --git a/cxpm/cxpm.c b/cxpm/cxpm.c
index f7a7c5e..7c2001f 100644
--- a/cxpm/cxpm.c
+++ b/cxpm/cxpm.c
@@ -22,7 +22,7 @@
  * used in advertising or otherwise to promote the sale, use or other dealings
  * in this Software without prior written authorization from Arnaud LE HORS.
  */
-/* $XFree86: xc/extras/Xpm/cxpm/cxpm.c,v 1.3 2003/05/27 16:45:41 tsi Exp $ */
+/* $XFree86: xc/extras/Xpm/cxpm/cxpm.c,v 1.2 2001/08/01 00:44:34 tsi Exp $ */
 
 /*****************************************************************************\
 * cxpm.c:                                                                     *
-- 
cgit v1.2.3