Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx9.cpp
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
#	imgui.cpp
#	imgui_internal.h
commit 1c385c2ca4410a2f9082f878f49efe0a54622fca
2 parents 25f25d5 + 6d6f4a8
@omar omar authored on 18 Apr 2018
Showing 12 changed files
View
.github/CONTRIBUTING.md
View
CHANGELOG.txt
View
TODO.txt
View
examples/imgui_impl_glfw.cpp
View
examples/imgui_impl_marmalade.cpp
View
examples/imgui_impl_sdl2.cpp
View
examples/imgui_impl_win32.cpp
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_internal.h
View
misc/fonts/README.txt