##// END OF EJS Templates
Merge branch 'feature/CatalogueCatalogue' of https://hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork into feature/CatalogueCatalogue...
Merge branch 'feature/CatalogueCatalogue' of https://hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork into feature/CatalogueCatalogue # Conflicts: # core/include/Catalogue/CatalogueController.h # gui/src/Visualization/VisualizationGraphWidget.cpp

File last commit:

r352:b2a47c61d04d
r1358:3e0e1e37ac63 merge feature/Catalogue...
Show More
amda.json
3 lines | 24 B | application/json | JsonLexer
{
"name" : "Amda"
}