1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-22 01:54:21 +00:00

Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	imgui.cpp
This commit is contained in:
ocornut 2021-02-18 11:40:39 +01:00
commit ffa863a3ba
42 changed files with 254 additions and 127 deletions

View file

@ -1,4 +1,4 @@
// dear imgui, v1.81
// dear imgui, v1.82 WIP
// (widgets code)
/*