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
#	examples/imgui_impl_dx11.cpp
#	imgui.cpp
This commit is contained in:
omar
2019-08-19 21:49:53 +02:00
parent 76ccbb899d a33cedda14
commit aedcd2fb1a
13 changed files with 118 additions and 81 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.72b
// dear imgui, v1.73 WIP
// (drawing and font code)
/*