Compare commits

...

26 commits
v2.2.3 ... main

Author SHA1 Message Date
Daan
af21001f7a clarify to use as the PR branch 2025-04-02 12:17:45 -07:00
Daan
9f5a2969b8 clarify v3 tag 2025-04-02 12:08:26 -07:00
Daan
13cd3f7f05 Merge branch 'dev2' 2025-03-28 14:20:20 -07:00
Daan
891f9f4cf6 fix conflict marker (issue #1038) 2025-03-19 20:38:19 -07:00
Daan
e112300059 Merge branch 'master' of https://github.com/microsoft/mimalloc 2025-03-06 20:59:26 -08:00
Daan
a62932135a merge from dev2: v2.2.2 2025-03-06 20:59:12 -08:00
Daan Leijen
1d8348b411 Merge branch 'dev2' 2025-01-03 20:28:03 -08:00
Daan Leijen
c9b8b82bf6 merge from dev2 2025-01-03 18:22:26 -08:00
Daan
2765ec9302 Merge branch 'dev-slice' 2024-05-21 12:27:13 -07:00
Daan
a1b284de0a Merge branch 'dev-slice' 2024-05-13 10:18:56 -07:00
Daan
8b15203950 merge from dev-slice 2024-05-13 09:15:44 -07:00
Daan
229ec9cbdc merge from dev-slice v2.1.4 2024-04-22 11:10:56 -07:00
microsoft-github-policy-service[bot]
4e50d6714d
Auto merge mandatory file pr
This pr is auto merged as it contains a mandatory file and is opened for more than 10 days.
2023-06-12 18:55:34 +00:00
microsoft-github-policy-service[bot]
5c90133021
Microsoft mandatory file 2023-06-02 17:40:26 +00:00
daanx
2cbf68b5e7 Merge branch 'dev-slice' 2023-04-24 09:32:44 -07:00
Daan Leijen
5ac9e36ed6 Merge branch 'dev-slice' 2023-04-03 12:39:35 -07:00
Daan Leijen
acdd35290e Merge branch 'dev-slice' 2023-03-29 16:43:22 -07:00
Daan Leijen
70450b80d2 fix readme links 2023-03-29 16:40:50 -07:00
Daan Leijen
c2e5031710 merge from dev-slice 2023-03-29 16:33:27 -07:00
Daan Leijen
dd7348066f Merge branch 'dev-slice' 2022-12-23 13:35:58 -08:00
Daan Leijen
df6e288519 merge from dev-slice v2.0.9 2022-12-23 13:34:21 -08:00
Daan
9b558e2a07
Merge pull request #655 from rganesan/patch-1
Fix typo
2022-12-19 17:26:55 -08:00
Ganesan Rajagopal
aea0de4777
Fix typo 2022-12-03 16:27:33 +05:30
Daan
c7d4a099d9
Merge pull request #641 from ofek/patch-1
Fix typo
2022-11-07 18:00:10 -08:00
Ofek Lev
18a4b90501
Fix typo 2022-11-05 16:29:18 -04:00
Daan
0e3d543a13
Update readme.md 2022-11-03 17:11:21 -07:00

View file

@ -73,7 +73,7 @@ Enjoy!
### Branches
* `master`: latest stable release (still based on `dev2`).
* `dev`: development branch for mimalloc v1. Use this branch for submitting PR's.
* `dev`: development branch for mimalloc v1. **Use this branch for submitting PR's**.
* `dev2`: development branch for mimalloc v2. This branch is downstream of `dev`
(and is essentially equal to `dev` except for `src/segment.c`). Uses larger sliced segments to manage
mimalloc pages that can reduce fragmentation.
@ -84,7 +84,7 @@ Enjoy!
### Releases
* 2025-03-28, `v1.9.3`, `v2.2.3`, `v3.0.3-beta`: Various small bug and build fixes, including:
* 2025-03-28, `v1.9.3`, `v2.2.3`, `v3.0.3` (beta): Various small bug and build fixes, including:
fix arm32 pre v7 builds, fix mingw build, get runtime statistics, improve statistic commit counts,
fix execution on non BMI1 x64 systems.
* 2025-03-06, `v1.9.2`, `v2.2.2`, `v3.0.2-beta`: Various small bug and build fixes.