Merge with develop

This commit is contained in:
kervala 2016-12-05 09:04:36 +01:00
parent b61c9d4cf8
commit 5baaa3bcd9
2 changed files with 2 additions and 5 deletions

View file

@ -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";

View file

@ -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