mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-14 00:34:18 +00:00
Code 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
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)
/*