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

This commit is contained in:
ocornut
2016-09-25 12:57:22 +02:00
34 changed files with 158 additions and 122 deletions

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();