mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Merge remote-tracking branch 'origin' into 2016-02-colorpicker

Browse source
This commit is contained in:
ocornut 2016-09-25 12:57:22 +02:00
commit 1b5bbf725b
34 changed files with 158 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

2
imgui_demo.cpp
View file

@ -896,7 +896,7 @@ void ImGui::ShowTestWindow(bool* p_open)
if (ImGui::TreeNode("Basic Horizontal Layout"))
{
ImGui::TextWrapped("(Use ImGui::SameLine() to keep adding items to the right of the preceeding item)");
ImGui::TextWrapped("(Use ImGui::SameLine() to keep adding items to the right of the preceding item)");
// Text
ImGui::Text("Two items: Hello"); ImGui::SameLine();