mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-01 03:30:06 +00:00
Code Activity

Merge branch 'master' into viewport

Browse source 
# Conflicts:
#	imgui.cpp
#	imgui.h
This commit is contained in:
omar 2019-01-10 16:01:36 +01:00
commit c96aaef132
9 changed files with 238 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

2
imgui_demo.cpp
View file

@ -4066,7 +4066,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;