Fix conflicts.

2014-07-12 17:02:39 +10:00
parent c09b0f511e
commit 9816ec3aa0
35 changed files with 99 additions and 103 deletions
@@ -14,7 +14,7 @@ __forceinline void SM_Sleep()
 	}
 	else
 	{
-		Sleep(1);
+		std::this_thread::sleep_for(std::chrono::milliseconds(1));
 	}
 }