Merge branch 'master' into docking
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx11.h
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_dx9.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_opengl3.h
#	examples/imgui_impl_osx.h
#	examples/imgui_impl_osx.mm
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
commit c72040a71505b11a218d0771ae33194ed7d164cb
2 parents c7c1bf1 + b3dd03f
@omar omar authored on 29 May 2019
Showing 24 changed files
View
docs/CHANGELOG.txt
View
docs/TODO.txt
View
examples/imgui_impl_dx10.cpp
View
examples/imgui_impl_dx10.h
View
examples/imgui_impl_dx11.cpp
View
examples/imgui_impl_dx11.h
View
examples/imgui_impl_dx12.cpp
View
examples/imgui_impl_dx12.h
View
examples/imgui_impl_dx9.cpp
View
examples/imgui_impl_dx9.h
View
examples/imgui_impl_opengl3.cpp
View
examples/imgui_impl_opengl3.h
View
examples/imgui_impl_osx.h
View
examples/imgui_impl_osx.mm
View
examples/imgui_impl_vulkan.cpp
View
examples/imgui_impl_vulkan.h
View
imconfig.h
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_draw.cpp
View
imgui_internal.h
View
imgui_widgets.cpp
View
misc/fonts/README.txt