Merge branch 'master' into docking

# Conflicts: # docs/CHANGELOG.txt
2026-11-01 05:10:41 +00:00 · 2019-07-27 18:21:41 -07:00 · 2019-07-27 18:21:41 -07:00 · a1164399b0
commit a1164399b0
parent e5b905481d ecb9b1e2eb
11 changed files with 73 additions and 44 deletions
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
--- a/docs/README.md
+++ b/docs/README.md
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
--- a/examples/README.txt
+++ b/examples/README.txt
--- a/imgui.cpp
+++ b/imgui.cpp
--- a/imgui.h
+++ b/imgui.h
--- a/imgui_demo.cpp
+++ b/imgui_demo.cpp
--- a/imgui_draw.cpp
+++ b/imgui_draw.cpp
--- a/imgui_internal.h
+++ b/imgui_internal.h
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
--- a/misc/fonts/README.txt
+++ b/misc/fonts/README.txt