summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2004-03-0523. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXESEgbert Eich3-3/+3
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-02-23merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2Kaleb Keithley1-2/+3
2003-11-30xfree86 mergeXEVIE-BASEKaleb Keithley2-140/+0
2003-11-26merge latest (4.3.99.16) from XFree86 (vendor) branchKaleb Keithley2-330/+108
2003-11-17merge XFree86 4.3.0.1 to -CURRENTKaleb Keithley3-30/+178
2003-11-14R6.6 is the Xorg base-lineXORG-MAINXORG-STABLEKaleb Keithley5-0/+4707