##// 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:

r345:7128846c289b
r369:65d06a34f5f1 merge
Show More
sqpguiresources.qrc
14 lines | 462 B | text/plain | TextLexer
<RCC>
<qresource prefix="/">
<file>icones/dataSourceComponent.png</file>
<file>icones/dataSourceNode.png</file>
<file>icones/dataSourceProduct.png</file>
<file>icones/dataSourceRoot.png</file>
<file>icones/delete.png</file>
<file>icones/openInspector.png</file>
<file>icones/next.png</file>
<file>icones/plot.png</file>
<file>icones/previous.png</file>
<file>icones/unplot.png</file>
</qresource>
</RCC>