Revert "resolve a conflict"
authorYann Collette <yann.collette@scilab.org>
Tue, 28 Jul 2009 11:44:36 +0000 (13:44 +0200)
committerYann Collette <yann.collette@scilab.org>
Tue, 28 Jul 2009 11:44:36 +0000 (13:44 +0200)
commit1bb25ba4db7a496365861f66d1d4bf333eb53e05
tree623e73dadf4772b056117694fdf6519e1de128da
parent6da66838e273673de7d40847fddeec4ed913cd6d
Revert "resolve a conflict"

This reverts commit 1cb69e2b186dd0c57d61359249ea21a931ef5eec.
19 files changed:
scilab/modules/differential_equations/help/en_US/bvode.xml
scilab/modules/differential_equations/help/en_US/dae.xml
scilab/modules/differential_equations/help/en_US/daeoptions.xml
scilab/modules/differential_equations/help/en_US/dasrt.xml
scilab/modules/differential_equations/help/en_US/dassl.xml
scilab/modules/differential_equations/help/en_US/feval.xml
scilab/modules/differential_equations/help/en_US/impl.xml
scilab/modules/differential_equations/help/en_US/int2d.xml
scilab/modules/differential_equations/help/en_US/int3d.xml
scilab/modules/differential_equations/help/en_US/intg.xml
scilab/modules/differential_equations/help/en_US/ode.xml
scilab/modules/differential_equations/help/en_US/ode_discrete.xml
scilab/modules/differential_equations/help/en_US/ode_root.xml
scilab/modules/differential_equations/help/en_US/odedc.xml
scilab/modules/differential_equations/help/en_US/odeoptions.xml
scilab/modules/differential_equations/help/fr_FR/feval.xml
scilab/modules/differential_equations/help/fr_FR/intg.xml
scilab/modules/differential_equations/help/fr_FR/ode.xml
scilab/modules/differential_equations/help/pt_BR/feval.xml