Merge branch 'master' into viewport

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_vulkan.cpp
#	examples/imgui_impl_win32.cpp
#	imgui.h
#	imgui_demo.cpp
This commit is contained in:
omar
2018-12-03 11:41:53 +01:00
8 changed files with 14 additions and 15 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.67 WIP
// dear imgui, v1.66b
// (demo code)
// Message to the person tempted to delete this file when integrating Dear ImGui into their code base: