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

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.h
This commit is contained in:
ocornut
2020-08-18 17:51:43 +02:00
parent b36d1d465d 95c99aaa4b
commit 05bc204dbd
13 changed files with 131 additions and 146 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 WIP
// dear imgui, v1.78
// (drawing and font code)
/*