| commit | 82eeafc1961557ab166fd588cee139db1f2a87cf | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Wed Feb 07 22:10:33 2024 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Wed Feb 07 22:10:33 2024 +0100 |
| tree | 31f258c8f454fa50562154e5569490035ba08e6e | |
| parent | 54ef4092a92f777ee6c855b08875e37a4e282b45 [diff] | |
| parent | 06ce312745e0b25bfa8412b324503393964e3812 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_glfw.cpp