Merge commit 'refs/remotes/origin/5.1'
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Tue, 30 Jun 2009 07:59:40 +0000 (09:59 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Tue, 30 Jun 2009 07:59:40 +0000 (09:59 +0200)
commitac327d02897492f1dc52f4f975df39fb171b6fdf
treebf6cacf0562b2d1ad193c86301ef153ac954010c
parent4b7d7cf94e20a29e77d131629b7297658b78ea1a
parente8a2111014a4d2c0ce9da14dbd5cae09fa758c73
Merge commit 'refs/remotes/origin/5.1'

Conflicts:
scilab/CHANGES_5.1.X
scilab/CHANGES_5.1.X
scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportRenderer.java