mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-22 04:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_internal.h
This commit is contained in:
ocornut
2022-11-24 21:26:49 +01:00
parent d2f9c5dfb7 a8df192df0
commit 595a428baa
10 changed files with 132 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imgui_draw.cpp
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.89.1 WIP
// dear imgui, v1.89.1
// (drawing and font code)
/*