Merge branch 'master' into viewport
# Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_glfw.h # examples/imgui_impl_sdl.cpp # examples/imgui_impl_sdl.h # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp # imgui_internal.h |
---|
CHANGELOG.txt |
---|
examples/.gitignore |
---|
examples/example_apple/imguiex.xcodeproj/project.pbxproj |
---|
examples/example_glfw_vulkan/CMakeLists.txt |
---|
examples/imgui_impl_glfw.cpp |
---|
examples/imgui_impl_glfw.h |
---|
examples/imgui_impl_sdl.cpp |
---|
examples/imgui_impl_sdl.h |
---|
examples/imgui_impl_win32.cpp |
---|
examples/imgui_impl_win32.h |
---|
imgui.cpp |
---|
imgui.h |
---|
imgui_demo.cpp |
---|
imgui_draw.cpp |
---|
imgui_internal.h |
---|