| commit | de1588928b69cee4efa7eada429d08a48695fb79 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Mon Aug 03 19:54:31 2020 +0200 |
| committer | omar <omarcornut@gmail.com> | Mon Aug 03 19:54:31 2020 +0200 |
| tree | 7831e31211fa6def23d18489377356cabfb274ce | |
| parent | 70fa37527df614c542bcfc9dba37e75b758f3d9f [diff] | |
| parent | 55041ac3bee2e7ac4e024103e3aa4555233f814a [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp