Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_win32.cpp
#	examples/example_marmalade/main.cpp
#	imgui.cpp
#	imgui.h
This commit is contained in:
ocornut
2021-12-22 16:02:04 +01:00
19 changed files with 54 additions and 581 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.86 WIP
// dear imgui, v1.86
// (internal structures/api)
// You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility!