##// 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
WrongUnit.txt
5 lines | 189 B | text/plain | TextLexer
#Sampling Time : 60
#Time Format : YYYY-MM-DDThh:mm:ss.mls
#Wrong unit comment
2013-09-23T09:00:30.000 -2.83950
2013-09-23T09:01:30.000 -2.71850
2013-09-23T09:02:30.000 -2.52150