| commit | 0647ba3badb9db94cb2dbc971cfc034e1c72f48a | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Jan 13 18:36:23 2022 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Thu Jan 13 18:36:23 2022 +0100 |
| tree | 9c1c90f6d4ae863c884029c60a8f0af5206ae527 | |
| parent | acfc7798fdbab692b8fa855c7dd4ec43bc0bd828 [diff] | |
| parent | 200a8f1ea21010c92f45428dc958d04b803ff5cd [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_osx.h # backends/imgui_impl_osx.mm # backends/imgui_impl_sdl.cpp # backends/imgui_impl_win32.cpp