GL- merge fix

2014-01-30 15:02:02 +01:00 · 2014-01-30 15:02:02 +01:00 · 4167b6a93b
parent 2bb2d0cd56
commit 4167b6a93b
2 changed files with 2 additions and 2 deletions
--- a/Code/Game/aDanBiasGameLauncher/Launcher.cpp
+++ b/Code/Game/aDanBiasGameLauncher/Launcher.cpp
@ -57,7 +57,7 @@ int WINAPI WinMain( HINSTANCE hinst, HINSTANCE prevInst, PSTR cmdLine, int cmdSh
 		return cmdShow;
 	}

-	serverThread = std::thread(ServerFnc);
+	//serverThread = std::thread(ServerFnc);

 	Sleep(200);

--- a/Code/Network/NetworkAPI/NetworkSession.h
+++ b/Code/Network/NetworkAPI/NetworkSession.h
@ -13,7 +13,7 @@
 #include "NetworkAPI_Preprocessor.h"
 #include "NetworkServerEventStruct.h"
 #include "NetworkClient.h"
-#include "Utilities.h"
+#include "..\Misc\Utilities.h"
 #include "DynamicArray.h"

 namespace Oyster