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.c | |
| 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.c')
| -rw-r--r-- | src/iconmgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/iconmgr.c b/src/iconmgr.c index f7af30d..edb5489 100644 --- a/src/iconmgr.c +++ b/src/iconmgr.c @@ -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.c,v 1.6 2001/12/14 20:01:08 dawes Exp $ */ +/* $XFree86: xc/programs/twm/iconmgr.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */ /*********************************************************************** * @@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group. * 09-Mar-89 Tom LaStrange File Created * ***********************************************************************/ -/* $XFree86: xc/programs/twm/iconmgr.c,v 1.6 2001/12/14 20:01:08 dawes Exp $ */ +/* $XFree86: xc/programs/twm/iconmgr.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */ #include <stdio.h> #include "twm.h" |