Merge remote-tracking branch 'alemuntoni/plugin_manager_refactoring' into plugin_manager_refactoring

# Conflicts:
#	src/common/globals/globals.cpp
This commit is contained in:
alemuntoni 2021-01-26 15:14:01 +01:00
commit ea28dc90e5

View File

@ -74,7 +74,7 @@ QString meshlab::defaultPluginPath()
pluginsDir.cd("PlugIns");
return pluginsDir.absolutePath();
}
if (pluginsDir.exists("plugins")) {
pluginsDir.cd("plugins");