Merge branch 'master' of git@git.scilab.org:scilab
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Fri, 26 Jun 2009 20:26:47 +0000 (22:26 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Fri, 26 Jun 2009 20:26:47 +0000 (22:26 +0200)
commit400e6be9d307ea59cc08824054e3a58965dcc998
tree4c25324d43f315f3a0645dc1c947867e9a2e3700
parenta9ed3f180f83555f4017d651c31b70449b50e3c6
parent0dbb302327887d85f6977a8f21b5aef2b79148d6
Merge branch 'master' of git@git.scilab.org:scilab

Conflicts:

scilab/CHANGES_5.1.X
scilab/CHANGES_5.1.X