##// END OF EJS Templates
Merge branch 'feature/CatalogueCatalogue' of https://hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork into feature/CatalogueCatalogue...
Merge branch 'feature/CatalogueCatalogue' of https://hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork into feature/CatalogueCatalogue # Conflicts: # core/include/Catalogue/CatalogueController.h # gui/src/Visualization/VisualizationGraphWidget.cpp

File last commit:

r983:131dd68d9046
r1358:3e0e1e37ac63 merge feature/Catalogue...
Show More
amdaresources.qrc
7 lines | 178 B | text/plain | TextLexer
Alexandre Leroux
Adds a sample JSON file as a resource in AMDA plugin...
r353 <RCC>
<qresource prefix="/">
<file>samples/AmdaSample.json</file>
Alexandre Leroux
Updates format of AMDA json and uses it in Sciqlop...
r522 <file>samples/AmdaSampleV2.json</file>
Alexandre Leroux
Updates AMDA JSON file to handle spectrograms...
r983 <file>samples/AmdaSampleV3.json</file>
Alexandre Leroux
Adds a sample JSON file as a resource in AMDA plugin...
r353 </qresource>
</RCC>