Conflicts: SConstruct common/include/editor/editor.h d2x-rebirth/editor/ehostage.c d2x-rebirth/include/d_glob.h d2x-rebirth/include/d_io.h d2x-rebirth/main/desc_id.h d2x-rebirth/main/gamestat.h d2x-rebirth/main/link.bat