| commit | 9f35ba8546b075dfb5d148be4e468ef8c0f5a41c | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Fri Jul 19 15:19:10 2019 -0700 |
| committer | omar <omarcornut@gmail.com> | Fri Jul 19 15:19:10 2019 -0700 |
| tree | eab913bc004469f4e93d6d0df699a4258252e469 | |
| parent | 7fd34d4f30d0e29af133dbe111aeb72b4dd3fa22 [diff] | |
| parent | b443bc0a64d5e22d445d2c9cb52f7f39da6b98c9 [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp