| commit | 8079344ceef3c7e03030db7794d9c8f300e798d0 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Sun Jan 20 22:12:06 2019 +0100 |
| committer | omar <omarcornut@gmail.com> | Sun Jan 20 22:12:06 2019 +0100 |
| tree | bb75cb56e12763f929ba39e626c469117ec1bf9c | |
| parent | 82e31d34f086070dc49228c4e8619b053331b27d [diff] | |
| parent | 259f3c78a20797640db225a349de9ccd0eb80a0d [diff] |
Merge branch 'master' into viewport # Conflicts: # examples/example_sdl_vulkan/main.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_vulkan.h # imgui.cpp