##// 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
perrinel -
r1315:7185ea8182da merge
Show More
Name Size Modified Last Commit Author
/ build_cfg / windows
build.sh Loading ...
cross_fedora_win64.txt Loading ...
install_script.sh Loading ...