| commit | a7ace918fec1ce86663f4fad7e74077cc72848d9 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Mar 05 11:48:57 2020 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Thu Mar 05 11:48:57 2020 +0100 |
| tree | ba64a6886c19f7d460a34e9747dc5e39e834b1a8 | |
| parent | 91ac93f9a6e37617e840e062b49873459a00cc21 [diff] | |
| parent | 0850b46c88daa92443dedf8609a80dbc1da52558 [diff] |
Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_win32.cpp # imgui.cpp