Merge commit 'refs/remotes/origin/5.1'
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Sun, 16 Aug 2009 07:35:58 +0000 (09:35 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Sun, 16 Aug 2009 07:35:58 +0000 (09:35 +0200)
commit02a737ce117fc399bdf2202a7e3076a4c5d9bead
tree1796021225f9c3d4865b11a0770724a5cc1d254b
parente5b1c8b1eec061869b1f3431abe208bb0adebae6
parent2d71c434bb66261e834e387fbecde23fbcd51ceb
Merge commit 'refs/remotes/origin/5.1'

Conflicts:
scilab/modules/core/help/pt_BR/chdir.xml
scilab/modules/core/help/pt_BR/exec.xml
scilab/modules/core/help/pt_BR/funptr.xml
scilab/modules/core/help/pt_BR/scilab.xml
scilab/modules/core/help/pt_BR/sethomedirectory.xml
scilab/modules/differential_equations/help/pt_BR/feval.xml
scilab/modules/dynamic_link/help/pt_BR/call.xml
scilab/modules/interpolation/help/pt_BR/linear_interpn.xml
12 files changed:
scilab/CHANGES_5.1.X
scilab/aclocal.m4
scilab/configure
scilab/configure.ac
scilab/modules/core/help/pt_BR/scilab.xml
scilab/modules/core/help/pt_BR/sethomedirectory.xml
scilab/modules/core/help/pt_BR/typename.xml
scilab/modules/differential_equations/help/pt_BR/feval.xml
scilab/modules/dynamic_link/help/pt_BR/call.xml
scilab/modules/functions/help/pt_BR/execstr.xml
scilab/modules/interpolation/help/pt_BR/splin3d.xml
scilab/modules/output_stream/help/pt_BR/ssprint.xml