| commit | ac08593b9645aee7e086b1e9b98a6a1d79d09210 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Nov 05 21:34:26 2020 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Thu Nov 05 21:36:22 2020 +0100 |
| tree | 4cbf52145c20f11ef04c1c6ed4efc9aff41aaa23 | |
| parent | e3ac52630a727ddaa5d642cba8b57d0b166e9fd0 [diff] | |
| parent | 5789e69a6259f4cf91ed9a523604b911c4e41191 [diff] |
Merge branch 'master' into docking + tweak dock node padding + use CheckboxFlags with int # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_internal.h