7 commits

Author	SHA1	Message	Date
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	e5deb8af66	Xutf8->XFree86utf8	2003-12-08 21:35:37 +00:00
Kaleb Keithley	45fea38d09	merge XFree86 4.3.99.901 (RC1) from vendor branch	2003-12-06 13:22:41 +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