mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Merge branch 'master' into docking

Browse source 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx11.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx12.h
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_wgpu.cpp
#	backends/imgui_impl_wgpu.h
#	imgui.h
This commit is contained in:
ocornut 2024-10-07 22:05:57 +02:00
commit fa9277d12d
25 changed files with 481 additions and 345 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.91.3
// dear imgui, v1.91.4 WIP
// (drawing and font code)
/*