mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-18 09:28:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)

Browse Source 
# Conflicts:
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
This commit is contained in:
ocornut
2024-05-14 16:25:02 +02:00
parent e391fe2e66 e4576914cb
commit eabe98f6d5
28 changed files with 164 additions and 66 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.90.6
// dear imgui, v1.90.7 WIP
// (drawing and font code)
/*