# Conflicts: # GNUmakefile # platform/Windows/rednukem.vcxproj # platform/Windows/rednukem.vcxproj.filters # source/rr/src/common_game.h # source/rr/src/screens.cpp