1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-01 03:30:06 +00:00

Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_vulkan.cpp
This commit is contained in:
ocornut 2025-01-15 17:34:17 +01:00
commit 015186aaf8
18 changed files with 124 additions and 106 deletions

View file

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