Merge branch 'examples_refactor2' into viewport (#1870)
# Conflicts: # examples/README.txt # examples/directx11_example/main.cpp # examples/directx12_example/main.cpp # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl2.cpp # examples/imgui_impl_sdl2.h # examples/imgui_impl_vulkan.cpp # examples/imgui_impl_vulkan.h # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # examples/opengl2_example/main.cpp # examples/opengl3_example/main.cpp # examples/sdl_opengl2_example/main.cpp # examples/sdl_opengl3_example/main.cpp # examples/sdl_vulkan_example/main.cpp # examples/vulkan_example/main.cpp # imgui.cpp # imgui.h |
---|
CHANGELOG.txt |
---|
examples/directx12_example/main.cpp |
---|
examples/imgui_impl_dx10.cpp |
---|
examples/imgui_impl_dx11.cpp |
---|
examples/imgui_impl_dx12.cpp |
---|
examples/imgui_impl_dx9.cpp |
---|
examples/imgui_impl_glfw.cpp |
---|
examples/imgui_impl_opengl2.cpp |
---|
examples/imgui_impl_opengl3.cpp |
---|
examples/imgui_impl_sdl2.cpp |
---|
examples/imgui_impl_sdl2.h |
---|
examples/imgui_impl_vulkan.cpp |
---|
examples/imgui_impl_vulkan.h |
---|
examples/imgui_impl_win32.cpp |
---|
examples/opengl2_example/main.cpp |
---|
examples/sdl_opengl2_example/main.cpp |
---|
examples/sdl_opengl3_example/main.cpp |
---|
examples/sdl_vulkan_example/main.cpp |
---|
examples/vulkan_example/main.cpp |
---|
imgui.h |
---|