349fab54a4
Conflicts: src/GUI/GameFrame.h src/GUI/TextureFrame.h vs11/Returngeance/Returngeance.vcxproj.filters
Conflicts: src/GUI/GameFrame.h src/GUI/TextureFrame.h vs11/Returngeance/Returngeance.vcxproj.filters