| tag | 97fa363adb1439d11b613d96bcda86d44ea16f4e | |
|---|---|---|
| tagger | ocornut <omar@miracleworld.net> | Thu Nov 07 20:02:49 2024 +0100 |
| object | 368123ab06b2b573d585e52f84cd782c5c006697 |
| commit | 368123ab06b2b573d585e52f84cd782c5c006697 | [log] [tgz] |
|---|---|---|
| author | ocornut <omar@miracleworld.net> | Thu Nov 07 19:58:23 2024 +0100 |
| committer | ocornut <omar@miracleworld.net> | Thu Nov 07 19:58:23 2024 +0100 |
| tree | 4bb9247315207c5299c814c3c42474195f6efd1c | |
| parent | d9f829dd7155098cf745998aa209f514482c4fe3 [diff] | |
| parent | f401021d5a5d56fe2304056c391e78f81c8d4b8f [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_metal.mm # imgui_draw.cpp