Cheri-research/mimallloc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
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 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>

3
ide/vs2022/mimalloc.vcxproj
View File

@@ -235,11 +235,8 @@
</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" />