Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-12-05 09:04:36 +01:00
commit eddc1e8434
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/misc/common.cpp
View file

@ -1518,7 +1518,7 @@ static bool openDocWithExtension (const std::string &document, const std::string
if (!CFile::fileExists(command)) if (!CFile::fileExists(command))
{ {
if (strcmp(ext, "htm") == 0) if (ext == "htm")
{ {
command = "/etc/alternatives/x-www-browser"; command = "/etc/alternatives/x-www-browser";

5
dist/snap/snapcraft.yaml vendored
View file

@ -17,10 +17,7 @@ apps:
parts: parts:
ryzom: ryzom:
source: https://bitbucket.org/ryzom/ryzomcore source: ../../code
source-type: hg
source-branch: compatibility-develop
source-subdir: code
plugin: cmake plugin: cmake
configflags: configflags:
- -DCMAKE_BUILD_TYPE=Release - -DCMAKE_BUILD_TYPE=Release