Merge with develop

code/nel/include/nel/misc/string_common.h

@@ -215,7 +215,7 @@ inline std::string toString(const size_t &val) { return toString("%u", val); }
 
 inline std::string toString(const float &val) { return toString("%f", val); }
 inline std::string toString(const double &val) { return toString("%lf", val); }
-inline std::string toString(const bool &val) { return toString("%u", val?1:0); }
+inline std::string toString(const bool &val) { return val ? "1":"0"; }
 inline std::string toString(const std::string &val) { return val; }
 
 // stl vectors of bool use bit reference and not real bools, so define the operator for bit reference

code/nel/tools/misc/crash_report/crash_report.cpp

@@ -90,6 +90,8 @@ public:
 	Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
 #endif
 
+	Q_IMPORT_PLUGIN(QIcoPlugin)
+
 #endif
 
 int main(int argc, char **argv)

code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua

@@ -219,7 +219,6 @@ end
 function game:updateTargetConsiderUI()
 	--debugInfo("Updating consider widget")
 
-
 	local targetWindow = getUI("ui:interface:target")	
 	-- 	
 	local wgTargetSlotForce = targetWindow:find("slot_force")
@@ -229,7 +228,7 @@ function game:updateTargetConsiderUI()
 	local wgToolTip     = targetWindow:find("target_tooltip")
 	local wgPvPTag     = targetWindow:find("pvp_tags")
 	local wgHeader     = targetWindow:find("header_opened")
-		
+
 	wgTargetSlotForce.active = true
 	wgImpossible.active = true