Conflicts: SConstruct common/main/vers_id.h d1x-rebirth/include/alloca.h d1x-rebirth/include/bcd.h d1x-rebirth/include/clipboard.h d1x-rebirth/include/compare.h d1x-rebirth/include/tracker/tracker.h d1x-rebirth/main/desc_id.h d1x-rebirth/main/script.h