##// 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
perrinel -
r1350:2f12aa502663 merge
Show More
Name Size Modified Last Commit Author
/ gui / ui / Catalogue
CatalogueEventsWidget.ui Loading ...
CatalogueExplorer.ui Loading ...
CatalogueInspectorWidget.ui Loading ...
CatalogueSideBarWidget.ui Loading ...
CreateEventDialog.ui Loading ...