Merge origin/6.0 into master 32/20632/1 master
Clément DAVID [Wed, 21 Nov 2018 15:58:16 +0000 (16:58 +0100)]
Change-Id: Ib96c51096a3012c18fd45bb53e611d4c2fdf7794

1  2 
scilab/modules/ast/src/cpp/types/sparse.cpp
scilab/modules/gui/src/java/org/scilab/modules/gui/editor/Editor.java