Merge branch 'master' into viewport

# Conflicts: # examples/imgui_impl_sdl.cpp
2026-03-30 05:05:17 -05:00 · 2018-11-26 14:53:51 +01:00
parent 379733aba1 35d648341b
commit 5261e5a6ba
9 changed files with 47 additions and 10 deletions
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -1,4 +1,4 @@
-// dear imgui, v1.66
+// dear imgui, v1.67 WIP
 // (main code and documentation)

 // Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code.