mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-07 23:41:26 +12:00
Fix conflicts.
This commit is contained in:
parent
c09b0f511e
commit
9816ec3aa0
35 changed files with 99 additions and 103 deletions
|
@ -94,6 +94,7 @@ void MemoryBlock::Free()
|
|||
void MemoryBlock::Delete()
|
||||
{
|
||||
Free();
|
||||
safe_free(mem);
|
||||
Init();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue