Merge origin/6.0 into master 75/20575/1 master
Clement DAVID [Mon, 22 Oct 2018 08:30:37 +0000 (10:30 +0200)]
Change-Id: Ic19f2a8eacad5f92f7b5891b455e4f01bdd01400

1  2 
scilab/modules/elementary_functions/sci_gateway/cpp/sci_max.cpp
scilab/modules/fileio/src/cpp/mgetl.cpp
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/xcos/etc/Xcos-style.xml

Simple merge