BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking

Browse Source 
# Conflicts:
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
This commit is contained in:
Jocke
2016-01-20 16:30:12 +01:00
parent 25d2aa3464 3376f4a16e
commit 00588b07c5
5 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Network/Server.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include "Network/PlayerDefinition.h"
#include "Core/World.h"
#include "Core/EventBroker.h"
#include "Network/Network.h"
#include "../Network/Network.h"
#include "Input/EInputCommand.h"
#include "Core/EPlayerDamage.h"