# Conflicts: # include/qbsp/qbsp.hh # include/qbsp/winding.hh # qbsp/brush.cc # qbsp/csg4.cc # qbsp/merge.cc