| tag | 7d9986a310edac308a0504e9088906d404d39a0e | |
|---|---|---|
| tagger | ocornut <omar@miracleworld.net> | Tue Jan 14 13:47:41 2025 +0100 |
| object | c0ae3258f9da5b959b214213ffe37ab36ea7f76f |
| commit | c0ae3258f9da5b959b214213ffe37ab36ea7f76f | [log] [tgz] |
|---|---|---|
| author | ocornut <omar@miracleworld.net> | Tue Jan 14 13:46:39 2025 +0100 |
| committer | ocornut <omar@miracleworld.net> | Tue Jan 14 13:46:39 2025 +0100 |
| tree | e7e85896191247f4600861777b02ae90d8c48279 | |
| parent | d0d571e0d72bdea4e84f46aec26fb0ce9d60a4da [diff] | |
| parent | 5c1d2d1e4c562a2ed3efbc64476e703a655b45fd [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp