Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-06 04:58:47 +02:00
Code Issues Packages Projects Releases Wiki 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
parent 1b435ae3e0 04fd5072fb
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)
/*