Merge commit 'refs/remotes/origin/5.1'
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Thu, 26 Mar 2009 22:32:00 +0000 (23:32 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Thu, 26 Mar 2009 22:32:00 +0000 (23:32 +0100)
commit7822787a7d31ff8f58f9556b7ab94b06e692aaed
tree9327502c4dda2d10e8caabbc9af49325737d17fc
parent08d8ea824c20a864ef12c60dfd4bc8bb7ce047fd
parent44ee767ebbca209f81c00b5e59caa9dba97259b5
Merge commit 'refs/remotes/origin/5.1'

Conflicts:
scilab/configure
scilab/ACKNOWLEDGEMENTS
scilab/configure
scilab/configure.ac