Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-06 13:08:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
omar
2019-07-31 14:34:58 -07:00
parent 07c52a25ff 6a0d0dab5a
commit b8d8355f10
9 changed files with 262 additions and 208 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.72
// dear imgui, v1.72b
// (drawing and font code)
/*