mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-22 15:16:12 +00:00
Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
eddc1e8434
2 changed files with 2 additions and 5 deletions
|
@ -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
5
dist/snap/snapcraft.yaml
vendored
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue