Fix conflicts.

This commit is contained in:
Sacha 2014-07-12 17:02:39 +10:00
parent c09b0f511e
commit 9816ec3aa0
35 changed files with 99 additions and 103 deletions

View file

@ -94,6 +94,7 @@ void MemoryBlock::Free()
void MemoryBlock::Delete()
{
Free();
safe_free(mem);
Init();
}