Commit Graph

6 Commits

Author SHA1 Message Date
Egbert Eich c6c6d0de23 Merged changes from RELEASE-1 branch 2004-04-15 10:17:35 +00:00
Alan Coopersmith 519f76a086 24. Update license for Xinerama code from DEC to the version requested by
Compaq for X11R6.5.1 that allows redistribution without written
    permission from DEC. Originally X.org Defect #9263. freedesktop.org
    bugzilla #283. (Alan Coopersmith)
2004-03-07 23:45:10 +00:00
Egbert Eich 505fe2ba30 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:41:12 +00:00
Kaleb Keithley 0097b6fe2d merge latest (4.3.99.16) from XFree86 (vendor) branch 2003-11-26 22:49:07 +00:00
Kaleb Keithley c57959ad6a merge XFree86 4.3.0.1 to -CURRENT 2003-11-17 19:03:47 +00:00
Kaleb Keithley ded6147bfb R6.6 is the Xorg base-line 2003-11-14 15:54:54 +00:00