Merge branch 'master' into docking

This commit is contained in:
ocornut
2024-12-11 15:08:31 +01:00
9 changed files with 32 additions and 32 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.91.6 WIP
// dear imgui, v1.91.6
// (demo code)
// Help:
@@ -10695,6 +10695,8 @@ void ImGui::ShowAboutWindow(bool*) {}
void ImGui::ShowDemoWindow(bool*) {}
void ImGui::ShowUserGuide() {}
void ImGui::ShowStyleEditor(ImGuiStyle*) {}
bool ImGui::ShowStyleSelector(const char* label) { return false; }
void ImGui::ShowFontSelector(const char* label) {}
#endif