summaryrefslogtreecommitdiff
path: root/src/icons.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:48:53 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:48:53 +0000
commit85b57c2eaec90b563f6acc70bcf8e5a4e9a6453f (patch)
tree4473b2c497e65c5d49f7a47642c4c711d54b3f8b /src/icons.c
parent9071e4e92738e8eb23df35a2e58bce30ab59b4c9 (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/icons.c')
-rw-r--r--src/icons.c2
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 $ */
/**********************************************************************
*