Teejoon 6fab971734 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates ...

Conflicts:
	include/Engine/Rendering/SpriteJob.h
	resources/Schema/Components.xsd
	resources/Schema/Entities/Player.xml
	resources/Schema/Entities/PlayerRed.xml

2016-02-22 16:43:18 +01:00

..

Engine

Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates

2016-02-22 16:43:18 +01:00

Game

Merge pull request #113 from teamfisk/Menu-Tobias

2016-02-19 13:16:50 +01:00