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

File last commit:

r1152:d60c64f6f148
r1350:2f12aa502663 merge
Show More
exclusions.txt
4 lines | 226 B | text/plain | TextLexer
AmdaResultParser\.h:\d+:.*IPSIS_S01.*
AmdaResultParserHelper\.h:\d+:.*IPSIS_S01.*
AmdaProvider\.cpp:\d+:.*IPSIS_S04_VARIABLE.*found: QStringLiteral
AmdaResultParserHelper\.cpp:\d+:.*IPSIS_S04_VARIABLE.*found: QT_VERSION_CHECK