Merge commit 'refs/remotes/origin/5.1'
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Sat, 28 Mar 2009 10:40:05 +0000 (11:40 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Sat, 28 Mar 2009 10:40:05 +0000 (11:40 +0100)
commitb14ba36bfbc9cef8f3ad92b2c87f6ea97993933b
treea8fe07edef42fa93434a5b353b7d9a9fc2500326
parent08d8ea824c20a864ef12c60dfd4bc8bb7ce047fd
parent44ee767ebbca209f81c00b5e59caa9dba97259b5
Merge commit 'refs/remotes/origin/5.1'

Conflicts:

scilab/configure
scilab/ACKNOWLEDGEMENTS
scilab/configure
scilab/configure.ac