mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-21 01:44:21 +00:00
Code 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
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)
/*