Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_win32.cpp
#	imgui.h
commit afeefadb4e80ca934643587c1da9caac74f4724a
2 parents f663277 + a423f03
@omar omar authored on 30 Nov 2018
Showing 22 changed files
View
.github/issue_template.md
View
docs/CHANGELOG.txt
View
examples/imgui_impl_allegro5.cpp
View
examples/imgui_impl_dx10.cpp
View
examples/imgui_impl_dx11.cpp
View
examples/imgui_impl_dx12.cpp
View
examples/imgui_impl_dx9.cpp
View
examples/imgui_impl_freeglut.cpp
View
examples/imgui_impl_glfw.cpp
View
examples/imgui_impl_marmalade.cpp
View
examples/imgui_impl_metal.mm
View
examples/imgui_impl_opengl2.cpp
View
examples/imgui_impl_opengl3.cpp
View
examples/imgui_impl_osx.mm
View
examples/imgui_impl_sdl.cpp
View
examples/imgui_impl_vulkan.cpp
View
examples/imgui_impl_win32.cpp
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_internal.h
View
imgui_widgets.cpp