mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-03-06 09:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2023-01-05 15:58:49 +01:00
parent fc3815bfe5 d7c8516a4b
commit d822c65317
13 changed files with 111 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imgui_draw.cpp
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.89.2 WIP
// dear imgui, v1.89.2
// (drawing and font code)
/*