Merge remote-tracking branch 'origin/5.4' 16/10816/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Thu, 14 Mar 2013 07:32:07 +0000 (08:32 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Thu, 14 Mar 2013 07:32:07 +0000 (08:32 +0100)
commit6f59c97e3f9707d5f8151d2e70561a04dedfc7cd
tree4db1569807b6e18613ef39bbb07b5597bf298799
parent7d644ef364425172ffb35c5a6d28b263f48a3945
parent1ab20c891bc9a1d027d0bf6827f7b7a7e6ba625c
Merge remote-tracking branch 'origin/5.4'

Conflicts:
scilab/modules/helptools/images/Equation_LaTeX_126.png
scilab/modules/helptools/images/Equation_LaTeX_135.png
scilab/modules/helptools/images/Equation_LaTeX_138.png
scilab/modules/helptools/images/Equation_LaTeX_139.png
scilab/modules/helptools/images/Equation_LaTeX_149.png
scilab/modules/helptools/images/Equation_LaTeX_152.png
scilab/modules/helptools/images/Equation_LaTeX_153.png
scilab/modules/helptools/images/Equation_LaTeX_155.png
scilab/modules/helptools/images/Equation_LaTeX_245.png
scilab/modules/helptools/images/Equation_LaTeX_249.png
scilab/modules/helptools/images/Equation_LaTeX_250.png
scilab/modules/helptools/images/Equation_LaTeX_251.png
scilab/modules/helptools/images/Equation_MathML_0.png
scilab/modules/helptools/images/Equation_MathML_1.png
scilab/modules/helptools/images/Equation_MathML_10.png
scilab/modules/helptools/images/Equation_MathML_11.png
scilab/modules/helptools/images/Equation_MathML_14.png
scilab/modules/helptools/images/Equation_MathML_15.png
scilab/modules/helptools/images/Equation_MathML_17.png
scilab/modules/helptools/images/Equation_MathML_2.png
scilab/modules/helptools/images/Equation_MathML_22.png
scilab/modules/helptools/images/Equation_MathML_23.png
scilab/modules/helptools/images/Equation_MathML_24.png
scilab/modules/helptools/images/Equation_MathML_5.png
scilab/modules/helptools/images/Equation_MathML_6.png
scilab/modules/helptools/images/Equation_MathML_7.png
scilab/modules/helptools/images/Equation_MathML_8.png
scilab/modules/helptools/images/Equation_MathML_9.png
scilab/modules/helptools/images/_LaTeX_karmarkar.xml_4.png
scilab/modules/helptools/images/_LaTeX_karmarkar.xml_5.png
scilab/modules/helptools/images/nicholschart_1.png
scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java

Change-Id: I5075d15398d08f0d79cac4e336353860e7f19c6e
162 files changed:
scilab/CHANGES_5.4.X
scilab/modules/helptools/images/_LaTeX_0-LSodar.xml_1.png
scilab/modules/helptools/images/_LaTeX_1-CVode.xml_1.png
scilab/modules/helptools/images/_LaTeX_1-CVode.xml_2.png
scilab/modules/helptools/images/_LaTeX_1-CVode.xml_3.png
scilab/modules/helptools/images/_LaTeX_1-CVode.xml_4.png
scilab/modules/helptools/images/_LaTeX_1-CVode.xml_5.png
scilab/modules/helptools/images/_LaTeX_1-CVode.xml_6.png
scilab/modules/helptools/images/_LaTeX_2-Runge-Kutta.xml_1.png
scilab/modules/helptools/images/_LaTeX_3-Dormand-Prince.xml_1.png
scilab/modules/helptools/images/_LaTeX_4-ImplicitRK.xml_1.png
scilab/modules/helptools/images/_LaTeX_7-IDA.xml_1.png
scilab/modules/helptools/images/_LaTeX_7-IDA.xml_2.png
scilab/modules/helptools/images/_LaTeX_7-IDA.xml_3.png
scilab/modules/helptools/images/_LaTeX_7-IDA.xml_4.png
scilab/modules/helptools/images/_LaTeX_7-IDA.xml_5.png
scilab/modules/helptools/images/_LaTeX_BITCLEAR.xml_1.png
scilab/modules/helptools/images/_LaTeX_BITSET.xml_1.png
scilab/modules/helptools/images/_LaTeX_CLSS.xml_1.png
scilab/modules/helptools/images/_LaTeX_CLSS.xml_2.png
scilab/modules/helptools/images/_LaTeX_CLSS.xml_4.png
scilab/modules/helptools/images/_LaTeX_CLSS.xml_5.png
scilab/modules/helptools/images/_LaTeX_DEADBAND.xml_2.png
scilab/modules/helptools/images/_LaTeX_DEADBAND.xml_3.png
scilab/modules/helptools/images/_LaTeX_DELAY_f.xml_1.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_1.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_10.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_11.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_12.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_13.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_14.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_15.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_16.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_17.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_18.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_19.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_2.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_21.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_22.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_24.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_3.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_4.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_5.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_7.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_8.png
scilab/modules/helptools/images/_LaTeX_DFLIPFLOP.xml_9.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_1.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_10.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_11.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_12.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_14.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_15.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_2.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_3.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_4.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_5.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_6.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_8.png
scilab/modules/helptools/images/_LaTeX_DLATCH.xml_9.png
scilab/modules/helptools/images/_LaTeX_EXPRESSION.xml_1.png
scilab/modules/helptools/images/_LaTeX_EXTRACTBITS.xml_1.png
scilab/modules/helptools/images/_LaTeX_GENSIN_f.xml_1.png
scilab/modules/helptools/images/_LaTeX_GENSQR_f.xml_2.png
scilab/modules/helptools/images/_LaTeX_GENSQR_f.xml_3.png
scilab/modules/helptools/images/_LaTeX_GENSQR_f.xml_4.png
scilab/modules/helptools/images/_LaTeX_INTRPLBLK_f.xml_1.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_10.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_11.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_12.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_13.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_14.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_15.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_16.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_17.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_18.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_19.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_2.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_3.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_4.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_5.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_7.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_8.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_9.png
scilab/modules/helptools/images/_LaTeX_LOGIC.xml_1.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_1.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_10.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_11.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_12.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_13.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_14.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_15.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_16.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_17.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_18.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_19.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_2.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_20.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_3.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_4.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_5.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_8.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_9.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_10.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_11.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_12.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_13.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_14.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_15.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_16.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_17.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_18.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_19.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_2.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_3.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_4.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_5.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_6.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_7.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_8.png
scilab/modules/helptools/images/_LaTeX_STEP_FUNCTION.xml_9.png
scilab/modules/helptools/images/_LaTeX_VARIABLE_DELAY.xml_1.png
scilab/modules/helptools/images/_LaTeX_assert_computedigits.xml_1.png
scilab/modules/helptools/images/_LaTeX_assert_computedigits.xml_2.png
scilab/modules/helptools/images/_LaTeX_cdfgam.xml_1.png
scilab/modules/helptools/images/_LaTeX_cdfnor.xml_1.png
scilab/modules/helptools/images/_LaTeX_cumprod.xml_3.png
scilab/modules/helptools/images/_LaTeX_dct.xml_4.png
scilab/modules/helptools/images/_LaTeX_dct.xml_6.png
scilab/modules/helptools/images/_LaTeX_grand.xml_2.png
scilab/modules/helptools/images/_LaTeX_grand.xml_3.png
scilab/modules/helptools/images/_LaTeX_grand.xml_4.png
scilab/modules/helptools/images/_LaTeX_grand.xml_5.png
scilab/modules/helptools/images/_LaTeX_grand.xml_6.png
scilab/modules/helptools/images/_LaTeX_histplot.xml_1.png
scilab/modules/helptools/images/_LaTeX_karmarkar.xml_1.png
scilab/modules/helptools/images/_LaTeX_karmarkar.xml_2.png
scilab/modules/helptools/images/_LaTeX_karmarkar.xml_3.png
scilab/modules/helptools/images/_LaTeX_karmarkar.xml_6.png
scilab/modules/helptools/images/_LaTeX_leastsq.xml_1.png
scilab/modules/helptools/images/_LaTeX_ode.xml_1.png
scilab/modules/helptools/images/_LaTeX_semidef.xml_1.png
scilab/modules/helptools/images/_LaTeX_semidef.xml_2.png
scilab/modules/helptools/images/_LaTeX_xcov.xml_10.png
scilab/modules/helptools/images/_LaTeX_xcov.xml_11.png
scilab/modules/helptools/images/_LaTeX_xcov.xml_6.png
scilab/modules/helptools/images/_LaTeX_xcov.xml_7.png
scilab/modules/helptools/images/_LaTeX_xcov.xml_8.png
scilab/modules/helptools/images/_LaTeX_xcov.xml_9.png
scilab/modules/helptools/images/_MathML_bvode.xml_13.png
scilab/modules/helptools/images/_MathML_bvode.xml_14.png
scilab/modules/helptools/images/_MathML_bvode.xml_17.png
scilab/modules/helptools/images/_MathML_bvode.xml_4.png
scilab/modules/helptools/images/_MathML_bvode.xml_5.png
scilab/modules/helptools/images/_MathML_bvode.xml_ru_RU_10.png
scilab/modules/helptools/images/_MathML_bvode.xml_ru_RU_7.png
scilab/modules/helptools/images/_MathML_convol.xml_1.png
scilab/modules/helptools/images/_MathML_levin.xml_1.png
scilab/modules/helptools/images/_MathML_levin.xml_2.png
scilab/modules/helptools/src/java/org/scilab/modules/helptools/DocbookTagConverter.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java
scilab/modules/spreadsheet/Makefile.in
scilab/modules/umfpack/Makefile.in