| commit | 6b011140576d5b7f94a6716235fc287ffb34ae34 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Fri Jun 23 16:04:13 2023 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Fri Jun 23 16:04:13 2023 +0200 |
| tree | 817f0b5f1b9a13d9e5fb4754a61ef6623f110f40 | |
| parent | 057fcae30cec04a55eec6532e0309ea6967950f3 [diff] | |
| parent | 6b2e03c5b1bc4f99dbd86d10e5fd12af9e3fe1c2 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_opengl3.cpp