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-exp; resolve conflicts

Browse source
This commit is contained in:
daan 2020-01-27 22:14:10 -08:00
parent b50bec463d
commit 09b98e0f7f
2 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -21,10 +21,6 @@ set(mi_sources
src/random.c
src/os.c
src/arena.c
<<<<<<< HEAD
=======
src/region.c
>>>>>>> dev-exp
src/segment.c
src/page.c
src/alloc.c