merge from dev

This commit is contained in:
daanx 2023-04-22 10:20:24 -07:00
commit 063f25ba11
7 changed files with 61 additions and 17 deletions

View file

@ -243,7 +243,6 @@
<ItemGroup>
<ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h" />
<ClInclude Include="$(ProjectDir)..\..\include\mimalloc-override.h" />
<ClInclude Include="..\..\include\mimalloc-etw.h" />
<ClInclude Include="..\..\include\mimalloc-new-delete.h" />
<ClInclude Include="..\..\include\mimalloc\atomic.h" />
<ClInclude Include="..\..\include\mimalloc\internal.h" />