704242597a
# Conflicts: # resources/Schema/Components.xsd # resources/Schema/Entities/NewMapWSpectatorCam.xml # resources/Schema/Types/Entity.xsd # src/Game/Game.cpp