Merge branch 'master' into viewport

# Conflicts: # examples/imgui_impl_sdl.cpp
2025-10-31 13:11:05 +01: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_draw.cpp
+++ b/imgui_draw.cpp
@@ -1,4 +1,4 @@
-// dear imgui, v1.66
+// dear imgui, v1.67 WIP
 // (drawing and font code)

 /*