mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-14 00:34:18 +00:00
Code Activity

Merge branch 'master' into docking

Browse source 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut 2023-03-16 12:01:13 +01:00
commit 6b3435a2db
44 changed files with 127 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
imgui.cpp
View file

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