Merge branch 'viewport' into docking

# Conflicts:
#	imgui.cpp
This commit is contained in:
omar
2019-01-10 16:02:32 +01:00
9 changed files with 238 additions and 169 deletions

View File

@ -4201,7 +4201,7 @@ void ShowExampleAppDocuments(bool* p_open)
{
static ExampleAppDocuments app;
if (!ImGui::Begin("Examples: Documents", p_open, ImGuiWindowFlags_MenuBar))
if (!ImGui::Begin("Example: Documents", p_open, ImGuiWindowFlags_MenuBar))
{
ImGui::End();
return;