diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:13 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:13 +0000 |
commit | dfea6bec2d256b103fa2ff235d1f4c5d847575e7 (patch) | |
tree | 9df15e877668cec46332769264740ab2b5b24f3e /src/util/atom.c | |
parent | f89c45a5bfa0c138a62df688ebd36b8e24e32793 (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEXORG-RELEASE-1-TMIPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'src/util/atom.c')
-rw-r--r-- | src/util/atom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util/atom.c b/src/util/atom.c index 3863c94..36a2f44 100644 --- a/src/util/atom.c +++ b/src/util/atom.c @@ -25,7 +25,7 @@ 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/lib/font/util/atom.c,v 1.10 2002/09/24 20:52:48 tsi Exp $ */ +/* $XFree86: xc/lib/font/util/atom.c,v 1.9 2002/09/19 13:22:00 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium |