Merge branch 'develop' into z64-devmerge

2022-06-17 00:39:07 -04:00
parent bb90be6748 3e6307bf96
commit dd42cca2cf
24 changed files with 355 additions and 299 deletions
--- a/StormLib/src/SFileListFile.cpp
+++ b/StormLib/src/SFileListFile.cpp
@@ -684,3 +684,4 @@ bool WINAPI SListFileFindClose(HANDLE hFind)

    return FreeListFileCache(pCache);
 }
+
--- a/StormLib/src/StormCommon.h
+++ b/StormLib/src/StormCommon.h
@@ -438,3 +438,4 @@ void DumpFileTable(TFileEntry * pFileTable, DWORD dwFileTableSize);
 #endif

 #endif // __STORMCOMMON_H__
+