GL- merge fix

This commit is contained in:
Sam Mario Svensson 2014-01-30 15:02:02 +01:00
parent 2bb2d0cd56
commit 4167b6a93b
2 changed files with 2 additions and 2 deletions

View File

@ -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);

View File

@ -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