commit c0d5b3f55a977fb3909bd80d90018a47fa5b0191
author omar <omarcornut@gmail.com> Thu May 07 23:58:35 2020 +0200
committer omar <omarcornut@gmail.com> Thu May 07 23:58:35 2020 +0200
tree 5ee743d4d218820ed39cccc7a73bd3c5804780ae
parent 53ebd6a02f92390e402edbc1ebaf445432066e08

Fix to facilitate branch merges

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index 14be81f..97950b6 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -10487,6 +10487,7 @@
                 Funcs::NodeWindowSettings(settings);
             ImGui::TreePop();
         }
+
 #ifdef IMGUI_HAS_TABLE
         if (ImGui::TreeNode("SettingsTables", "Settings packed data: Tables: %d bytes", g.SettingsTables.size()))
         {
@@ -10495,6 +10496,10 @@
             ImGui::TreePop();
         }
 #endif
+
+#ifdef IMGUI_HAS_DOCK
+#endif
+
         if (ImGui::TreeNode("SettingsIniData", "Settings unpacked data (.ini): %d bytes", g.SettingsIniData.size()))
         {
             char* buf = (char*)(void*)(g.SettingsIniData.Buf.Data ? g.SettingsIniData.Buf.Data : "");