* resolved two conflicts caused by lineend changes in canvashelper_texturefill.cxx and implrenderer.cxx. Took the cws version, which uses new texture fill semantics, and fixes clipping bug * binned file header changes from head for deleted files
