viktorljung 7d4a4ed7cf Merge remote-tracking branch 'origin/master' into Animations ...

# Conflicts:
#	src/Engine/Rendering/Skeleton.cpp

2016-02-11 14:38:23 +01:00

..

Engine

Merge remote-tracking branch 'origin/master' into Animations

2016-02-11 14:38:23 +01:00

Game

Protected inheritance, not even once.

2016-02-11 11:36:39 +01:00