kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-06 15:29:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge ide files

Browse source
This commit is contained in:
daanx 2023-04-04 16:48:02 -07:00
parent 24034c997c
commit 9f0da5c195
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

3
ide/vs2022/mimalloc.vcxproj
View file

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