##// END OF EJS Templates
Merge branch 'feature/ThreadFix' of...
Merge branch 'feature/ThreadFix' of https://perrinel@hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation into feature/ThreadFix Conflicts: core/src/Variable/Variable.cpp core/src/Variable/VariableCacheController.cpp core/src/Variable/VariableController.cpp gui/src/Visualization/VisualizationGraphHelper.cpp plugins/mockplugin/src/CosinusProvider.cpp

File last commit:

r344:93d5f7162981
r369:65d06a34f5f1 merge
Show More
dataSourceNode.png
0 lines | 882 B | image/png | TextLexer
/ gui / resources / icones / dataSourceNode.png
rendered-image