mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-22 01:54:21 +00:00
Code Activity

Merge branch 'master' into docking

Browse source 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut 2021-05-25 18:45:54 +02:00
commit 1ad1429c6d
10 changed files with 196 additions and 151 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.83
// dear imgui, v1.84 WIP
// (widgets code)
/*