Merge branch '5.1' of git@git.scilab.org:scilab into 5.1
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Tue, 31 Mar 2009 22:59:33 +0000 (00:59 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Tue, 31 Mar 2009 22:59:33 +0000 (00:59 +0200)
commit2f935d284d66d60a1dd6e6ccd2b8e8da32bf1779
tree3fafab27be69d375867f03346224e69d8dfda5df
parentaae4745e786116e59af3cd2fc40d759335b83f98
parent3ec84ef73cc91e478b0e5f52383c4e7297b1df34
Merge branch '5.1' of git@git.scilab.org:scilab into 5.1

Conflicts:

scilab/CHANGES_5.1.X
scilab/ACKNOWLEDGEMENTS
scilab/CHANGES_5.1.X
scilab/configure
scilab/configure.ac