| commit | 138d9d0c218fd41fc7dd124d026a49fd2548b1a7 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Fri Jun 28 16:03:49 2024 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Fri Jun 28 16:03:49 2024 +0200 |
| tree | c19d0cba1d3e6db19964687bb08754cf302f7e52 | |
| parent | a028c2df2a381720f39bce6d292c6c2ea28e5de7 [diff] | |
| parent | 0403096a9d3574d6c07eda91daf79d45e3fbf927 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_opengl2.cpp # backends/imgui_impl_opengl3.cpp