| commit | f9b5168fb3560f2868f04958abc9b5fac1f216f1 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Mon Aug 02 15:04:45 2021 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Mon Aug 02 16:00:50 2021 +0200 |
| tree | 2ef2c9e59f299ab76ac8061c94db64b68115b778 | |
| parent | 7bfc379a23e97b6777eb80aafb50a8e6248904cd [diff] | |
| parent | db686ad5222a00bab7caa39f546313522642f57e [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_sdl.cpp # backends/imgui_impl_win32.cpp # imgui.cpp