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

r620:3dbb981097b0
r1315:7185ea8182da merge
Show More
sciqlopLOGO.icns
0 lines | 989.0 KiB | application/octet-stream | TextLexer
/ build_cfg / mac / sciqlopLOGO.icns
Binary file (application/octet-stream)