mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-26 12:27:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.h
This commit is contained in:
omar
2020-07-14 18:38:47 +02:00
parent cbade7b16d eefae08261
commit f79f0e42f7
16 changed files with 289 additions and 103 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.77
// dear imgui, v1.78 WIP
// (widgets code)
/*