Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-14 00:39:55 +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:
ocornut
2021-01-21 20:38:42 +01:00
parent ebbb98d519 58075c4414
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)
/*