Merge commit 'origin/5.1'
authorPierre LANDO <pierre.lando@scilab.org>
Mon, 21 Sep 2009 09:24:48 +0000 (11:24 +0200)
committerPierre LANDO <pierre.lando@scilab.org>
Mon, 21 Sep 2009 09:24:48 +0000 (11:24 +0200)
commit40da173d309b1a4f16eb851cc9a70d9cdf15426e
tree49e5ea1fc3fe381c205e7477b08998a968c5b5b9
parentaa7a641a3a7f0d783ecbdff8a1f00aa04bdc157f
parent8ec2c6307beaa930bdcea7f3dd83e7e5313f568a
Merge commit 'origin/5.1'

Conflicts:
scilab/modules/graphics/help/en_US/xsegs.xml