mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-04 05:51:27 +12:00
Fix conflicts.
This commit is contained in:
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));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue