From: Marcos CARDINOT Date: Sat, 30 Jul 2016 02:00:14 +0000 (+0100) Subject: Merge branch 'master' of git://git.scilab.org/scilab into palette-browser X-Git-Tag: 6.0.0~251^2~2 X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=ee85dd20b7a5ddfc915df31fde4609b62683cfaf Merge branch 'master' of git://git.scilab.org/scilab into palette-browser Change-Id: I3a724df920c171266e7f96266907e1ad303ecc90 --- ee85dd20b7a5ddfc915df31fde4609b62683cfaf