Commit graph

13 commits

Author SHA1 Message Date
Alexander Gottwald
10d08801a3 Pull XORG-6_8_0 to CYGWIN branch 2004-09-15 16:31:16 +00:00
Alexander Gottwald
fe435f233b merge with XORG-RELEASE-1 2004-03-18 12:00:22 +00:00
Alexander Gottwald
2c7920dec5 merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE) 2004-03-17 20:25:08 +00:00
Egbert Eich
b82e8b257b 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). 2004-03-05 13:38:15 +00:00
Kaleb Keithley
1f42e6ce18 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.
2004-02-24 20:26:32 +00:00
Kaleb Keithley
86c0fe5f7e merge XFree86 RC2 (4.3.99.902) from vendor branch 2003-12-20 00:28:22 +00:00
Kaleb Keithley
79bf36b054 Xutf8->XFree86utf8 2003-12-08 16:42:30 +00:00
Kaleb Keithley
adedeafd21 fix bad merge 2003-11-29 13:52:54 +00:00
Kaleb Keithley
12e9abcfd0 fix bad merge 2003-11-29 13:39:50 +00:00
Kaleb Keithley
c568351b30 fix bad merge 2003-11-29 13:31:57 +00:00
Kaleb Keithley
0642e99ac0 merge latest (4.3.99.16) from XFree86 (vendor) branch 2003-11-26 22:48:16 +00:00
Kaleb Keithley
400780e6a7 merge XFree86 4.3.0.1 to -CURRENT 2003-11-17 19:03:18 +00:00
Kaleb Keithley
deae12c6b6 R6.6 is the Xorg base-line 2003-11-14 15:54:30 +00:00