Merge commit 'refs/remotes/origin/5.1'
authorPierre MARECHAL <pierre.marechal@scilab.org>
Thu, 15 Jan 2009 14:01:37 +0000 (15:01 +0100)
committerPierre MARECHAL <pierre.marechal@scilab.org>
Thu, 15 Jan 2009 14:01:37 +0000 (15:01 +0100)
commitea604708655bab154f5300eb5f492505e713dd8d
treefd609f528fab0dfc65f8ab2a9264d4af6717d425
parente071a270246e55b1fa4a753752c9bfdbca9a93af
parent503f93aeee57dcf08d70c05df49b0575ece894ac
Merge commit 'refs/remotes/origin/5.1'

Conflicts:

scilab/modules/graphic_export/help/en_US/xs2bmp.xml
scilab/modules/graphic_export/help/en_US/xs2emf.xml
scilab/modules/graphic_export/help/en_US/xs2eps.xml
scilab/modules/graphic_export/help/en_US/xs2fig.xml
scilab/modules/graphic_export/help/en_US/xs2gif.xml
scilab/modules/graphic_export/help/en_US/xs2jpg.xml
scilab/modules/graphic_export/help/en_US/xs2pdf.xml
scilab/modules/graphic_export/help/en_US/xs2png.xml
scilab/modules/graphic_export/help/en_US/xs2ppm.xml
scilab/modules/graphic_export/help/en_US/xs2ps.xml
scilab/modules/graphic_export/help/en_US/xs2svg.xml
scilab/modules/graphic_export/help/en_US/xs2bmp.xml
scilab/modules/graphic_export/help/en_US/xs2emf.xml
scilab/modules/graphic_export/help/en_US/xs2eps.xml
scilab/modules/graphic_export/help/en_US/xs2fig.xml
scilab/modules/graphic_export/help/en_US/xs2gif.xml
scilab/modules/graphic_export/help/en_US/xs2jpg.xml
scilab/modules/graphic_export/help/en_US/xs2pdf.xml
scilab/modules/graphic_export/help/en_US/xs2png.xml
scilab/modules/graphic_export/help/en_US/xs2ppm.xml
scilab/modules/graphic_export/help/en_US/xs2ps.xml
scilab/modules/graphic_export/help/en_US/xs2svg.xml