1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-26 02:34:23 +00:00

Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut 2023-01-05 15:58:49 +01:00
commit d822c65317
13 changed files with 111 additions and 218 deletions

View file

@ -1,4 +1,4 @@
// dear imgui, v1.89.2 WIP
// dear imgui, v1.89.2
// (main code and documentation)
// Help: