Merge commit 'origin/5.1'
authorBruno JOFRET <bruno.jofret@scilab.org>
Mon, 21 Sep 2009 08:47:15 +0000 (10:47 +0200)
committerBruno JOFRET <bruno.jofret@scilab.org>
Mon, 21 Sep 2009 08:47:15 +0000 (10:47 +0200)
commit01e62ccd1815b41bbfe82c60270d19b8480c8704
treeb33644656ef48837f36716da6d3672bef1d27130
parent0f6e528402c3797a9dc6a1d8174c5b37a153fe59
parent4e13111d8e4e7cb5e38d699321bf13b017797a00
Merge commit 'origin/5.1'

Conflicts:
scilab/modules/graphics/includes/BuildObjects.h
scilab/CHANGES_5.1.X
scilab/modules/graphics/includes/BuildObjects.h
scilab/modules/graphics/includes/sciCall.h
scilab/modules/graphics/sci_gateway/c/sci_xarrows.c
scilab/modules/graphics/sci_gateway/c/sci_xsegs.c
scilab/modules/graphics/src/c/BuildObjects.c
scilab/modules/graphics/src/c/Champ.c
scilab/modules/graphics/src/c/sciCall.c
scilab/modules/scicos_blocks/src/c/scoWindowScope.c