tag | 0c05f4eb472d0eec9e51c5d301608e184aa39313 | |
---|---|---|
tagger | ocornut <omarcornut@gmail.com> | Wed May 08 16:24:00 2024 +0200 |
object | e391fe2e66eb1c96b1624ae8444dc64c23146ef4 |
commit | e391fe2e66eb1c96b1624ae8444dc64c23146ef4 | [log] [tgz] |
---|---|---|
author | ocornut <omarcornut@gmail.com> | Wed May 08 16:17:32 2024 +0200 |
committer | ocornut <omarcornut@gmail.com> | Wed May 08 16:17:32 2024 +0200 |
tree | 80d31ce507e5523de0befaeddaf14a26a7544b3f | |
parent | 8b2c6dd42fb02dc95a581bb8c7db0199064cfced [diff] | |
parent | 6ccc561a2ab497ad4ae6ee1dbd3b992ffada35cb [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_opengl3.cpp # imgui.cpp # imgui_internal.h