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 /src/parse.c | |
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 'src/parse.c')
-rw-r--r-- | src/parse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parse.c b/src/parse.c index fc8cd2b..3c819a2 100644 --- a/src/parse.c +++ b/src/parse.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 GROUPE BULL. */ -/* $XFree86: xc/extras/Xpm/lib/parse.c,v 1.3 2001/10/28 03:32:10 tsi Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/parse.c,v 1.2 2000/09/26 15:56:43 tsi Exp $ */ /*****************************************************************************\ * parse.c: * @@ -33,7 +33,7 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/parse.c,v 1.3 2001/10/28 03:32:10 tsi Exp $ */ +/* $XFree86$ */ /* * The code related to FOR_MSW has been added by |