# Conflicts: # common/bspinfo.cc # include/common/bspfile.hh # include/qbsp/map.hh # include/qbsp/wad.hh # qbsp/wad.cc