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
commit 770cba0bd027be745fa62e17dab49cfc6ce2534d
2 parents c38fe6b + ddb09c6
@omar omar authored on 2 Jul 2018
Showing 15 changed files
View
CHANGELOG.txt
View
examples/.gitignore
View
examples/example_apple/imguiex.xcodeproj/project.pbxproj
View
examples/example_glfw_vulkan/CMakeLists.txt
View
examples/imgui_impl_glfw.cpp
View
examples/imgui_impl_glfw.h
View
examples/imgui_impl_sdl.cpp
View
examples/imgui_impl_sdl.h
View
examples/imgui_impl_win32.cpp
View
examples/imgui_impl_win32.h
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_draw.cpp
View
imgui_internal.h