From 3e0e1e37ac630193ba452d2a4750f61836b68bf6 2017-12-21 20:50:33
From: mperrinel <meriadegp@gmail.com>
Date: 2017-12-21 20:50:33
Subject: [PATCH] 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

---