stiffly 6d649e4d35 Merge remote-tracking branch 'origin/Networking' into Networking ...

# Conflicts:
#	src/Engine/Network/Client.cpp

2015-12-18 11:26:48 +01:00

..

Engine

Merge remote-tracking branch 'origin/Networking' into Networking

2015-12-18 11:26:48 +01:00

Game

Fixes, mostly name changes

2015-12-17 17:28:43 +01:00