| commit | 44174b1fa1815759c329c1f7670f23dc4316ab04 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Tue Jan 14 20:01:27 2020 +0100 |
| committer | omar <omarcornut@gmail.com> | Tue Jan 14 20:01:27 2020 +0100 |
| tree | 2e3b804e5598d3b9c07ceb20054756506ac9b592 | |
| parent | 861f786d816eac498be9ef95a3fabe49289ea6ee [diff] | |
| parent | 2ebe08be40da88eada47a8c2a5ba6f6c93e91acb [diff] |
Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp # imgui_internal.h