diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:17 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:17 +0000 |
| commit | e8a005881cad65292bd73a2ed8f7454ce9d461f0 (patch) | |
| tree | 4473b2c497e65c5d49f7a47642c4c711d54b3f8b /src/icons.c | |
| parent | 9071e4e92738e8eb23df35a2e58bce30ab59b4c9 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'src/icons.c')
| -rw-r--r-- | src/icons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/icons.c b/src/icons.c index 937096b..95c786f 100644 --- a/src/icons.c +++ b/src/icons.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/icons.c,v 1.7 2002/12/10 22:29:54 tsi Exp $ */ +/* $XFree86: xc/programs/twm/icons.c,v 1.6 2001/12/14 20:01:08 dawes Exp $ */ /********************************************************************** * |