| commit | 90ea7e2f2f3c4096a58b8bd14c274d80ae63e1ce | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Tue Jun 30 16:43:16 2020 +0200 |
| committer | omar <omarcornut@gmail.com> | Tue Jun 30 16:43:16 2020 +0200 |
| tree | edc2572111c810cf8f1154574ba07a08fcb650b7 | |
| parent | ddabfc34776d02c16d762b671fdbdd17582d5ab8 [diff] | |
| parent | 0738611559b0a51c7fa0c376eb9601587231f841 [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_internal.h