Merge branch 'master' into viewport

misc/stl/imgui_stl.cpp

@@ -1,7 +1,11 @@
 // imgui_stl.cpp
-// Wrappers for STL types (std::string, etc.)
+// Wrappers for C++ standard library (STL) types (std::string, etc.)
 // This is also an example of how you may wrap your own similar types.
 
+// Compatibility:
+// - std::string support is only guaranteed to work from C++11. 
+//   If you try to use it pre-C++11, please share your findings (w/ info about compiler/architecture)
+
 #include "imgui.h"
 #include "imgui_stl.h"
 

misc/stl/imgui_stl.h

@@ -1,7 +1,11 @@
 // imgui_stl.h
-// Wrappers for STL types (std::string, etc.)
+// Wrappers for C++ standard library (STL) types (std::string, etc.)
 // This is also an example of how you may wrap your own similar types.
 
+// Compatibility:
+// - std::string support is only guaranteed to work from C++11. 
+//   If you try to use it pre-C++11, please share your findings (w/ info about compiler/architecture)
+
 // Changelog:
 // - v0.10: Initial version. Added InputText() / InputTextMultiline() calls with std::string