summaryrefslogtreecommitdiff
path: root/mfb/mergerop.h
AgeCommit message (Expand)AuthorFilesLines
2004-03-0418. Merged in XFree86 code up to 4.4.0 including changes to files that hadEgbert Eich1-1/+1
2003-11-17merge XFree86 4.3.0.1 to -CURRENTKaleb Keithley1-19/+228
2003-11-14R6.6 is the Xorg base-lineXORG-MAINKaleb Keithley1-0/+186