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

merge from dev

Browse source
This commit is contained in:
Daan 2022-02-14 16:36:03 -08:00
commit 19edc880da
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmake/mimalloc-config-version.cmake
View file

@ -1,6 +1,12 @@
<<<<<<< HEAD
set(mi_version_major 2)
set(mi_version_minor 0)
set(mi_version_patch 4)
=======
set(mi_version_major 1)
set(mi_version_minor 7)
set(mi_version_patch 5)
>>>>>>> dev
set(mi_version ${mi_version_major}.${mi_version_minor})
set(PACKAGE_VERSION ${mi_version})