Merge remote branch 'origin/5.3' 06/3606/1
authorBruno JOFRET <bruno.jofret@scilab.org>
Tue, 22 Mar 2011 14:33:38 +0000 (15:33 +0100)
committerBruno JOFRET <bruno.jofret@scilab.org>
Tue, 22 Mar 2011 14:33:38 +0000 (15:33 +0100)
commite037015d45aee12d3720602e84d2b49ef6f22db9
treed979b7dd7e856f3d30305a6895ce2863a93e4482
parent9cb51730b1407dea9b88cb560c5af5f413dce970
parent38a5302d12a14930d959876a96b3facc1b080b33
Merge remote branch 'origin/5.3'

Conflicts:
SEP/INDEX

Change-Id: I8b62bbb5ca13d60c628715d0b043bf25bb27cb72
SEP/INDEX
scilab/modules/dynamic_link/macros/ilib_compile.sci
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html