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

r385:3748118d0cf1
r1315:7185ea8182da merge
Show More
exclusions.txt
4 lines | 174 B | text/plain | TextLexer
# Ignore false positive relative to App macro
\.h:\d+:.IPSIS_S04.*found: Ui
# Ignore false positive relative to macros
Main\.cpp:\d+:.*IPSIS_S04_VARIABLE.*found: (__ppc64__)