From 5baaa3bcd9222635ba5f9b1b62b2d076f1b4bfb7 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Mon, 5 Dec 2016 09:04:36 +0100
Subject: [PATCH] Merge with develop

---
 code/nel/src/misc/common.cpp | 2 +-
 dist/snap/snapcraft.yaml     | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp
index f455f121f..ca116d0f8 100644
--- a/code/nel/src/misc/common.cpp
+++ b/code/nel/src/misc/common.cpp
@@ -1518,7 +1518,7 @@ static bool openDocWithExtension (const std::string &document, const std::string
 
 	if (!CFile::fileExists(command))
 	{
-		if (strcmp(ext, "htm") == 0)
+		if (ext == "htm")
 		{
 			command = "/etc/alternatives/x-www-browser";
 
diff --git a/dist/snap/snapcraft.yaml b/dist/snap/snapcraft.yaml
index 0a8f5486d..659a58a7d 100644
--- a/dist/snap/snapcraft.yaml
+++ b/dist/snap/snapcraft.yaml
@@ -17,10 +17,7 @@ apps:
 
 parts:
   ryzom:
-    source: https://bitbucket.org/ryzom/ryzomcore
-    source-type: hg
-    source-branch: compatibility-develop
-    source-subdir: code
+    source: ../../code
     plugin: cmake
     configflags:
         - -DCMAKE_BUILD_TYPE=Release