mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-08-03 14:19:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h
This commit is contained in:
ocornut
2024-05-08 16:17:32 +02:00
parent 8b2c6dd42f 6ccc561a2a
commit e391fe2e66
25 changed files with 258 additions and 81 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.90.6 WIP
// dear imgui, v1.90.6
// (widgets code)
/*