##// END OF EJS Templates
Merge branch 'develop' of...
Merge branch 'develop' of https://perrinel@hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork into develop Conflicts: core/src/Catalogue/CatalogueController.cpp

File last commit:

r21:45edf6844d32
r1315:7185ea8182da merge
Show More
qlopapp.qrc
5 lines | 94 B | text/plain | TextLexer
<RCC>
<qresource prefix="/">
<file>sciqlopLOGO.svg</file>
</qresource>
</RCC>