diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:42:32 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:42:32 +0000 |
| commit | 2773a7214e282f6f673483f5233b880505947c3f (patch) | |
| tree | 2326842ad31be4a6899598b0bf221bc5aacc6356 /include | |
| parent | 65c64a2eaa8698434f1869dcdcb5d9ccb21c6932 (diff) | |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-baseXORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGElg3d-eventlg3d-dev-0-6-latestlg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3dCOMPOSITEWRAP
Diffstat (limited to 'include')
| -rw-r--r-- | include/X11/xpm.h | 2 |
1 files changed, 1 insertions, 1 deletions
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: * |