imports/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-03-30 21:05:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_widgets.cpp
This commit is contained in:
ocornut
2022-06-21 18:28:33 +02:00
parent 9764adc7bb 9aae45eb4a
commit 9cd9c2eff9
11 changed files with 211 additions and 190 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.88 WIP
// dear imgui, v1.88
// (drawing and font code)
/*