Conflicts: CMakeLists.txt: Just merged the new affine renderer headers and texture_extraction.hpp.
Attach a file by drag & drop or click to upload
