merge origin/6.0 into master 00/20700/1
Clément DAVID [Tue, 15 Jan 2019 12:16:33 +0000 (13:16 +0100)]
Change-Id: I4f2a31f58d56f2fbb02f5ffdf55bdf5cb42ffaed

1  2 
scilab/modules/helptools/data/configuration/scilab_macros.txt