6e78307249
Conflicts: src/GUI/GameFrame.h src/GameWorld.cpp vs11/Returngeance/Returngeance.vcxproj.filters
Conflicts: src/GUI/GameFrame.h src/GameWorld.cpp vs11/Returngeance/Returngeance.vcxproj.filters