##// END OF EJS Templates
Merge branch 'develop' of...
Merge branch 'develop' of https://perrinel@hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork into develop Conflicts: core/src/Catalogue/CatalogueController.cpp

File last commit:

r793:b20d31286862
r1315:7185ea8182da merge
Show More
WrongDate.txt
5 lines | 329 B | text/plain | TextLexer
Alexandre Leroux
Archives AMDA v2 files and reuses AMDA v1 files for tests
r793 #Sampling Time : 60
#Time Format : YYYY-MM-DDThh:mm:ss.mls
#imf(0) - Type : Local Parameter @ CDPP/AMDA - Name : bx_gse - Units : nT - Size : 1 - Frame : GSE - Mission : ACE - Instrument : MFI - Dataset : mfi_final-prelim
Alexandre Leroux
Unit tests cases
r397 23/09/2013 07:50:30 -2.83950
2013-09-23T09:01:30.000 -2.71850
2013-09-23T09:02:30.000 -2.52150