mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-25 02:24:24 +00:00
Code Activity

Merge branch 'master' into docking

Browse source 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
ocornut 2021-01-21 20:38:42 +01:00
commit bb26751b94
10 changed files with 324 additions and 254 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.80 WIP
// dear imgui, v1.80
// (drawing and font code)
/*