Merge branch 'master' into docking
# Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx11.h # examples/imgui_impl_dx9.cpp # examples/imgui_impl_dx9.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # examples/imgui_impl_osx.h # examples/imgui_impl_osx.mm # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h |
---|
docs/CHANGELOG.txt |
---|
docs/TODO.txt |
---|
examples/imgui_impl_dx10.cpp |
---|
examples/imgui_impl_dx10.h |
---|
examples/imgui_impl_dx11.cpp |
---|
examples/imgui_impl_dx11.h |
---|
examples/imgui_impl_dx12.cpp |
---|
examples/imgui_impl_dx12.h |
---|
examples/imgui_impl_dx9.cpp |
---|
examples/imgui_impl_dx9.h |
---|
examples/imgui_impl_opengl3.cpp |
---|
examples/imgui_impl_opengl3.h |
---|
examples/imgui_impl_osx.h |
---|
examples/imgui_impl_osx.mm |
---|
examples/imgui_impl_vulkan.cpp |
---|
examples/imgui_impl_vulkan.h |
---|
imconfig.h |
---|
imgui.cpp |
---|
imgui.h |
---|
imgui_demo.cpp |
---|
imgui_draw.cpp |
---|
imgui_internal.h |
---|
imgui_widgets.cpp |
---|
misc/fonts/README.txt |
---|