Merge commit 'origin/5.1'
authorPierre LANDO <pierre.lando@scilab.org>
Tue, 6 Oct 2009 11:51:23 +0000 (13:51 +0200)
committerPierre LANDO <pierre.lando@scilab.org>
Tue, 6 Oct 2009 11:51:23 +0000 (13:51 +0200)
commitff6f94a081ff5e0df19a39cfba4cb0ef2bca5fe4
tree775a5e05922712ee512f49290a1392e01804019d
parentafe22f00b5deb2268ec6a3ed61cc30911cbb5eef
parente52bbcd6df36b283108ced11eab8f08860dcfd99
Merge commit 'origin/5.1'

Conflicts:
scilab/modules/graphics/macros/contourf.sci
scilab/modules/graphics/macros/contour.sci
scilab/modules/graphics/macros/contour2d.sci
scilab/modules/graphics/macros/contourf.sci