diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:10 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:10 +0000 |
commit | 01e908f07de620b63ddd531634573cca0e5ff447 (patch) | |
tree | 2326842ad31be4a6899598b0bf221bc5aacc6356 /src/XpmI.h | |
parent | 8636e5cc7ce7ce5ac913e6a59e2a8e1ea9065b1e (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'src/XpmI.h')
-rw-r--r-- | src/XpmI.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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/XpmI.h,v 1.9 2003/08/06 14:03:58 eich Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/XpmI.h,v 1.7 2001/11/01 23:35:25 dawes Exp $ */ /*****************************************************************************\ * XpmI.h: * |