Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'GSoC2017-evaluation-final'

Browse source
This commit is contained in:
Gioacchino Mazzurco 2017-08-18 01:37:39 +02:00
commit 32f43b999e
1431 changed files with 6666 additions and 445 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/rsserver/rsinit.cc
View file

@ -1189,7 +1189,7 @@ int RsServer::StartupRetroShare()
#ifdef __APPLE__
plugins_directories.push_back(rsAccounts->PathDataDirectory()) ;
#endif
#ifndef WINDOWS_SYS
#if !defined(WINDOWS_SYS) && defined(PLUGIN_DIR)
plugins_directories.push_back(std::string(PLUGIN_DIR)) ;
#endif
std::string extensions_dir = rsAccounts->PathBaseDirectory() + "/extensions6/" ;