Merge with develop

This commit is contained in:
kervala 2016-01-14 10:22:22 +01:00
commit 06353eaa43

View file

@ -635,7 +635,7 @@ static void addPaths(IProgressCallback &progress, const std::vector<std::string>
directoryPrefixes.push_back(CPath::standardizePath(getAppBundlePath() + "/Contents/Resources"));
// check in same directory as bundle (Steam)
directoryPrefixes.push_back(CPath::standardizePath(getAppBundlePath());
directoryPrefixes.push_back(CPath::standardizePath(getAppBundlePath()));
#elif defined(NL_OS_UNIX)
if (CFile::isDirectory(getRyzomSharePrefix())) directoryPrefixes.push_back(CPath::standardizePath(getRyzomSharePrefix()));
#endif