Merge branch 'master' into viewport

# Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp
2026-09-22 20:24:58 +08:00 · 2018-12-04 00:05:45 +01:00
parent f6b6ad1959 fb6ef8b1db
commit 3a678d48b1
10 changed files with 35 additions and 12 deletions
@@ -1,4 +1,4 @@
-// dear imgui, v1.66b
+// dear imgui, v1.67 WIP
 // (drawing and font code)

 /*