kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-07-07 03:48:42 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge from dev-reset

Browse source
This commit is contained in:
daanx 2023-04-04 16:44:07 -07:00
commit 24034c997c
18 changed files with 316 additions and 765 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ide/vs2022/mimalloc-override.vcxproj
View file

@ -257,7 +257,11 @@
</ClCompile>
<ClCompile Include="..\..\src\page.c" />
<ClCompile Include="..\..\src\random.c" />
<<<<<<< HEAD
<ClCompile Include="..\..\src\segment-cache.c" />
=======
<ClCompile Include="..\..\src\segment-map.c" />
>>>>>>> dev-reset
<ClCompile Include="..\..\src\segment.c" />
<ClCompile Include="..\..\src\stats.c" />
</ItemGroup>

4
ide/vs2022/mimalloc.vcxproj
View file

@ -235,7 +235,11 @@
</ClCompile>
<ClCompile Include="..\..\src\page.c" />
<ClCompile Include="..\..\src\random.c" />
<<<<<<< HEAD
<ClCompile Include="..\..\src\segment-cache.c" />
=======
<ClCompile Include="..\..\src\segment-map.c" />
>>>>>>> dev-reset
<ClCompile Include="..\..\src\segment.c" />
<ClCompile Include="..\..\src\os.c" />
<ClCompile Include="..\..\src\stats.c" />