Jocke 2cb5441b1c Merge remote-tracking branch 'origin/Networking' into Networking ...

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

2015-12-17 09:47:15 +01:00

..

Engine

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

2015-12-17 09:47:15 +01:00

Game

Added a class that client and server inherits from.

2015-12-16 14:56:53 +01:00