| commit | 6994bf10bc57ff5e723a8de92ea7957d5e174568 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Tue Sep 24 17:14:51 2019 +0200 |
| committer | omar <omarcornut@gmail.com> | Tue Sep 24 17:14:51 2019 +0200 |
| tree | dc7f3bc2a71a4ac183f2186959c7de96146dc15e | |
| parent | 3233d85d2f7565d5d5ae3edfc311597fe790256f [diff] | |
| parent | d5efe161572c894baed5865dee4db943a54fa0c3 [diff] |
Merge branch 'master' into docking + fix for RenderMouseCursor() # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_draw.cpp # imgui_internal.h