| tag | 79f1e536d9a25fbe40127abf5baf4569ee910787 | |
|---|---|---|
| tagger | ocornut <omarcornut@gmail.com> | Wed Jan 10 18:36:35 2024 +0100 |
| object | 2dc85e6e438e6d7f485317c9b76dc153535fed16 |
| commit | 2dc85e6e438e6d7f485317c9b76dc153535fed16 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Wed Jan 10 18:34:08 2024 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Wed Jan 10 18:34:23 2024 +0100 |
| tree | 07d744f132809c9e7490c395594a441a52769fb2 | |
| parent | cf020235658f86cfbc8ae4596a5b2c946f5c846e [diff] | |
| parent | d6cb3c923d28dcebb2d8d9605ccc7229ccef19eb [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_opengl3.cpp # imgui.cpp # imgui_internal.h