Merge branch 'master' into docking
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.h
#	imgui_demo.cpp
commit 8dc04a4c9fc70e833df91095327a022cd5d5635e
2 parents c72040a + 7755cbb
@omar omar authored on 29 May 2019
Showing 14 changed files
View
docs/CHANGELOG.txt
View
examples/imgui_examples.sln
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_opengl3.cpp
View
examples/imgui_impl_osx.h
View
examples/imgui_impl_osx.mm
View
examples/imgui_impl_vulkan.cpp
View
imconfig.h
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp