From 58a8269cd88628a8edb8b0e4e3cde99f89269860 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 21 Jan 2016 10:04:59 +0100
Subject: [PATCH 1/4] Changed: Allow to specify code path and use egrep

--HG--
branch : develop
---
 dist/debian/ryzomcore_version.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/dist/debian/ryzomcore_version.sh b/dist/debian/ryzomcore_version.sh
index c072095f2..55129da1d 100755
--- a/dist/debian/ryzomcore_version.sh
+++ b/dist/debian/ryzomcore_version.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 
-CODEROOT=../../code
+CODEROOT=$1
+
+if [ -z "$CODEROOT" ]
+then
+  CODEROOT=../../code
+fi
 
 VERSION_FILE=$CODEROOT/CMakeLists.txt
 
@@ -12,10 +17,11 @@ fi
 
 parse_version()
 {
-  FILE=$1
-  VAR=$2
+  PREFIX=$1
+  FILE=$2
+  VAR=$3
 
-  V=$(grep -o -P "NL_$VAR [0-9]+" $FILE | awk '{print $2}' | head -n 1)
+  V=$(egrep -o $PREFIX"_$VAR [0-9]+" $FILE | awk '{print $2}' | head -n 1)
 
   if [ -z "$V" ]
   then
@@ -26,9 +32,9 @@ parse_version()
   export $VAR=$V
 }
 
-parse_version $VERSION_FILE VERSION_MAJOR
-parse_version $VERSION_FILE VERSION_MINOR
-parse_version $VERSION_FILE VERSION_PATCH
+parse_version NL $VERSION_FILE VERSION_MAJOR
+parse_version NL $VERSION_FILE VERSION_MINOR
+parse_version NL $VERSION_FILE VERSION_PATCH
 
 VERSION=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH
 

From e281fc1706e2899807d639ee67ce8c939aa99fba Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 21 Jan 2016 10:05:10 +0100
Subject: [PATCH 2/4] Changed: Minor changes

--HG--
branch : develop
---
 code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua b/code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua
index d36486e99..e10ad2f6f 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua
+++ b/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
 

From a08cdce80339dd79a5ed0f02e6eeab72185b6cad Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 21 Jan 2016 10:05:26 +0100
Subject: [PATCH 3/4] Fixed: Use icon under Windows

--HG--
branch : develop
---
 code/nel/tools/misc/crash_report/crash_report.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/nel/tools/misc/crash_report/crash_report.cpp b/code/nel/tools/misc/crash_report/crash_report.cpp
index 08063d78e..030a623c6 100644
--- a/code/nel/tools/misc/crash_report/crash_report.cpp
+++ b/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)

From aff9cccd0c2f8b0988b0b7f9ba5ea6681a608fb7 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Thu, 21 Jan 2016 10:06:35 +0100
Subject: [PATCH 4/4] Changed: Improve toString(const bool &val)...

--HG--
branch : develop
---
 code/nel/include/nel/misc/string_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/nel/include/nel/misc/string_common.h b/code/nel/include/nel/misc/string_common.h
index 9ac55101f..e6d08bdeb 100644
--- a/code/nel/include/nel/misc/string_common.h
+++ b/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