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

r1105:05e3746491f3 feature/Integrati...
r1315:7185ea8182da merge
Show More
QxOrm.wrap
5 lines | 83 B | text/plain | TextLexer
add missin QxOrm.wrap
r1105 [wrap-git]
directory=QxOrm
url=https://github.com/jeandet/qxorm.git
revision=head