| commit | 03134725ae35b4257770005fb34728f2efec2926 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Mon Jan 03 20:31:11 2022 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Mon Jan 03 20:31:11 2022 +0100 |
| tree | bc15dd1a2e88e22c944d72ef0b2817d107c773d2 | |
| parent | 9c8f288d1a9038e7f62ccb76328bb8f328c0b89d [diff] | |
| parent | ff6a7ad4f0b730e0f2afd27d866d3243964372ff [diff] |
Merge branch 'thedmd/extra-keys-v1' into docking # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_glfw.h # backends/imgui_impl_osx.h # backends/imgui_impl_osx.mm # backends/imgui_impl_sdl.cpp # backends/imgui_impl_sdl.h # backends/imgui_impl_win32.cpp # backends/imgui_impl_win32.h # imgui.cpp # imgui.h