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

r983:131dd68d9046
r1315:7185ea8182da merge
Show More
amdaresources.qrc
7 lines | 178 B | text/plain | TextLexer
<RCC>
<qresource prefix="/">
<file>samples/AmdaSample.json</file>
<file>samples/AmdaSampleV2.json</file>
<file>samples/AmdaSampleV3.json</file>
</qresource>
</RCC>