##// 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
mperrinel -
r1358:3e0e1e37ac63 merge feature/Catalogue...
Show More
Name Size Modified Last Commit Author
/ gui / resources / icones
add.png Loading ...
allEvents.png Loading ...
catalogue.png Loading ...
chart.png Loading ...
cursor.png Loading ...
dataSourceComponent.png Loading ...
dataSourceNode.png Loading ...
dataSourceProduct.png Loading ...
dataSourceRoot.png Loading ...
database.png Loading ...
delete.png Loading ...
discard.png Loading ...
down.png Loading ...
drag.png Loading ...
next.png Loading ...
openInspector.png Loading ...
plot.png Loading ...
pointer.png Loading ...
previous.png Loading ...
rectangle.png Loading ...
remove.png Loading ...
save.png Loading ...
sciqlop2PNG_1024.png Loading ...
time.png Loading ...
trash.png Loading ...
unplot.png Loading ...
up.png Loading ...
zoom.png Loading ...