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:
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
ocornut
2021-01-28 21:02:13 +01:00
parent cff8162454 9499afdf5e
commit 577e7cb493
32 changed files with 1744 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imgui_widgets.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.80
// dear imgui, v1.81 WIP
// (widgets code)
/*