Jocke e0c3a32e66 Merge branch 'master' into TCPConnections ...

# Conflicts:
#	include/Engine/Network/Client.h
#	include/Engine/Network/Server.h
#	include/Game/Game.h
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
#	src/Game/Game.cpp

2016-02-11 16:26:42 +01:00

..

Engine

Merge branch 'master' into TCPConnections

2016-02-11 16:26:42 +01:00

Game

Protected inheritance, not even once.

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