Fix merge issues
libdoom|libdoom64|libheretic: DED / MAPINFO interoperability patches