Tleety 502a290d36 Merge branch 'master' into HUD-Timers ...

# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/PlayerRed.xml
#	resources/Schema/Types/Entity.xsd

2016-03-02 14:22:13 +01:00

..

Engine

Merge pull request #153 from teamfisk/RenderSetingsV2

2016-03-02 13:15:52 +01:00

Game

Merge branch 'master' into HUD-Timers

2016-03-02 14:22:13 +01:00