Merge branch 'master' into viewport
# Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_win32.cpp # imgui.h |
---|
.github/issue_template.md |
---|
docs/CHANGELOG.txt |
---|
examples/imgui_impl_allegro5.cpp |
---|
examples/imgui_impl_dx10.cpp |
---|
examples/imgui_impl_dx11.cpp |
---|
examples/imgui_impl_dx12.cpp |
---|
examples/imgui_impl_dx9.cpp |
---|
examples/imgui_impl_freeglut.cpp |
---|
examples/imgui_impl_glfw.cpp |
---|
examples/imgui_impl_marmalade.cpp |
---|
examples/imgui_impl_metal.mm |
---|
examples/imgui_impl_opengl2.cpp |
---|
examples/imgui_impl_opengl3.cpp |
---|
examples/imgui_impl_osx.mm |
---|
examples/imgui_impl_sdl.cpp |
---|
examples/imgui_impl_vulkan.cpp |
---|
examples/imgui_impl_win32.cpp |
---|
imgui.cpp |
---|
imgui.h |
---|
imgui_demo.cpp |
---|
imgui_internal.h |
---|
imgui_widgets.cpp |
---|