| commit | 0b06c4b2b0281a8aced61f276bb3f6ad0f6f9180 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Aug 19 17:25:12 2021 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Thu Aug 19 17:25:12 2021 +0200 |
| tree | e7c95eed5f9b1e7c9cf37885ad132eee460e0ea3 | |
| parent | 80b5fb51edba2fd3dea76ec3e88153e2492243d1 [diff] | |
| parent | cb00972b878a0a4722c9214e6f7d46d97f092c3f [diff] |
Merge branch 'master' into docking (will need further for io.AddFocusEvent) # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_sdl.cpp # backends/imgui_impl_win32.cpp # imgui.cpp