Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-10-31 21:21:06 +01: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
2020-08-20 22:42:14 +02:00
parent 05bc204dbd 9b50e691ed
commit ad8fdc917f
10 changed files with 214 additions and 57 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.78
// dear imgui, v1.79 WIP
// (drawing and font code)
/*