Merge branch 'master' into docking (incl glfw use of GLFW_VERSION_COMBINED)

Note switched from GLFW_VERSION_REVISION * 10 to GLFW_VERSION_REVISION * 1

imgui_demo.cpp

@@ -1142,6 +1142,7 @@ static void ShowDemoWindowWidgets()
     IMGUI_DEMO_MARKER("Widgets/Combo");
     if (ImGui::TreeNode("Combo"))
     {
+        // Combo Boxes are also called "Dropdown" in other systems
         // Expose flags as checkbox for the demo
         static ImGuiComboFlags flags = 0;
         ImGui::CheckboxFlags("ImGuiComboFlags_PopupAlignLeft", &flags, ImGuiComboFlags_PopupAlignLeft);