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

---
 include/X11/xpm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/X11')

diff --git a/include/X11/xpm.h b/include/X11/xpm.h
index 8895323..1cbc3a3 100644
--- a/include/X11/xpm.h
+++ b/include/X11/xpm.h
@@ -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 GROUPE BULL.
  */
-/* $XFree86: xc/extras/Xpm/lib/xpm.h,v 1.3 2003/11/17 22:20:02 dawes Exp $ */
+/* $XFree86: xc/extras/Xpm/lib/xpm.h,v 1.2 2001/08/22 23:36:44 dawes Exp $ */
 
 /*****************************************************************************\
 * xpm.h:                                                                      *
-- 
cgit v1.2.3