| commit | 5ecef2f321db4923c0139efdfcd56f4ac5860ca0 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu May 23 17:25:02 2024 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Thu May 23 17:25:02 2024 +0200 |
| tree | a0fb3d3fc3ba2a6388c427f5a9b1ce4712095f4d | |
| parent | 36ffdd69d304659388ad3d3be487a467de65eaf6 [diff] | |
| parent | d5a600e9c64a570c22912f9fc23290f6c1592353 [diff] |
Merge branch 'master' into docking # Conflicts: # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # imgui.cpp