CVSROOT: /cvs/xorg Module name: xc Changes by: twini at pdx. 04/08/07 05:39:57 Log message: (Remove conflict indicator) Modified files: ./: ChangeLog Revision Changes Path 1.215 +1 -2 xc/ChangeLog