mirror of
https://github.com/ocornut/imgui.git
synced 2026-04-29 18:54:27 +00:00
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl3.cpp # docs/CHANGELOG.txt # examples/example_glfw_metal/main.mm # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_win32_opengl3/main.cpp # examples/example_win32_vulkan/main.cpp # imgui.h
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
// dear imgui, v1.92.3 WIP
|
||||
// dear imgui, v1.92.3
|
||||
// (drawing and font code)
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user