| commit | 9cda3035fde72683527db8533c58a1451a80ad17 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Mon Jul 22 10:29:14 2019 -0700 |
| committer | omar <omarcornut@gmail.com> | Mon Jul 22 10:29:14 2019 -0700 |
| tree | bba626f9947e85b6ca9675dd8ae96195f0984aef | |
| parent | 47f5ad32b77a6d0a19f5ac04cb5d816e24da4133 [diff] | |
| parent | 363d33f64ea988f11c124207b89d9f4f15f11be9 [diff] |
Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # imgui.cpp