| commit | 15b4a064f9244c430e65214f7249b615fb394321 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Wed Dec 22 16:02:04 2021 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Wed Dec 22 16:02:04 2021 +0100 |
| tree | 17ebc3f6affffb387e7d27420dbe6f764beb3934 | |
| parent | 06d5f9297de441d229f717bf6284bb14e71970f9 [diff] | |
| parent | 512c54bbc062c41c74f8a8bd8ff1fd6bebd1e6d0 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_win32.cpp # examples/example_marmalade/main.cpp # imgui.cpp # imgui.h