| commit | 994853511803cd37ccb0e804442049c947b09cc3 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Feb 17 18:47:43 2022 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Thu Feb 17 18:47:43 2022 +0100 |
| tree | ece67b9fa2e581f1cea74b37a6f3bc288969b020 | |
| parent | 1e14cc5cae703b7cdf0e33c50165d6dd289fcb1f [diff] | |
| parent | 29d462ebce0275345a6ce4621d8fff0ded57c9e5 [diff] |
Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui.h # imgui_draw.cpp