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

r620:3dbb981097b0
r1350:2f12aa502663 merge
Show More
meson.build
2 lines | 36 B | text/plain | TextLexer
subdir('mockplugin')
subdir('amda')