- removing ': ' from lines which broke the build. These were added by a broken script that automatically removed spurious conflitcs do to CVS tag mismatches. The 'XdotOrg' tag really haunts me!

19. Merging in Kaleb's changes to XlibInt.c which reflect Keith's fix to version 3.41 in the Xlib repository (Egbert Eich).

18. Merged in XFree86 code up to 4.4.0 including changes to files that had a changed license. There was only one change which happened to be from me (Egbert Eich).

5. Reversed Xinerama changes (Egbert Eich). 4. Reversed Xutf8* to XFree86utf8* function name changes for the release (Egbert Eich). 3. Removed sources for patch which were included when patch had a bad bug (Egbert Eich). 2. Removed unnecessary fonts (Egbert Eich). 1. Removed XIE and PEX extension files from release tree. The build environment has been gone already (Egbert Eich).

bug #216 provide better compatibility semantics in Xlib for people who are compiling or linking against older Xlibs that have XFree86's UTF-8 functions.
This goes away if Sun's I18N people recommend adopting the functions and the xorg_arch list agree, but for now we have this hackery to deal with third parties who scribbled non-standard functions in our API.

defect #199 in bugs.freedesktop.org. Fix broken UTF-8 support. In renaming non-standard additions to Xlib made by XFree86, i.e. UTF-8 converters, I renamed more things than I should have.

freedesktop.org bugzilla defect #200 Add various and sundry locale names to the aliases These come variously from SUSE 9, Solaris 9, and AIX 5.2

defect #199 in bugs.freedesktop.org. Fix broken UTF-8 support. In renaming non-standard additions to Xlib made by XFree86, i.e. UTF-8 converters, I renamed more things than I should have.

1. Fixed problem when running binaries during build when installed i18n libs did not fit to the newly build Xlib: Added rule to link i18n libs to exports/lib/locale and added environment variable XLOCALEDIR to prefix for calling binaries so i18n libs from build tree get used instead of installed ones.