diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:53 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:53 +0000 |
| commit | 85b57c2eaec90b563f6acc70bcf8e5a4e9a6453f (patch) | |
| tree | 4473b2c497e65c5d49f7a47642c4c711d54b3f8b /src/iconmgr.h | |
| parent | 9071e4e92738e8eb23df35a2e58bce30ab59b4c9 (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'src/iconmgr.h')
| -rw-r--r-- | src/iconmgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/iconmgr.h b/src/iconmgr.h index 1a956f0..eba3dc5 100644 --- a/src/iconmgr.h +++ b/src/iconmgr.h @@ -22,7 +22,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/programs/twm/iconmgr.h,v 1.6 2001/12/14 20:01:08 dawes Exp $ */ +/* $XFree86: xc/programs/twm/iconmgr.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */ /*********************************************************************** * |