##// 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
/ core / include / Data
AcquisitionDataPacket.h Loading ...
AcquisitionRequest.h Loading ...
ArrayData.h Loading ...
ArrayDataIterator.h Loading ...
DataProviderParameters.h Loading ...
DataSeries.h Loading ...
DataSeriesIterator.h Loading ...
DataSeriesMergeHelper.h Loading ...
DataSeriesType.h Loading ...
DataSeriesUtils.h Loading ...
IDataProvider.h Loading ...
IDataSeries.h Loading ...
OptionalAxis.h Loading ...
ScalarSeries.h Loading ...
SpectrogramSeries.h Loading ...
SqpIterator.h Loading ...
SqpRange.h Loading ...
Unit.h Loading ...
VariableRequest.h Loading ...
VectorSeries.h Loading ...