Merge remote-tracking branch 'origin/5.4' 69/11169/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 29 Mar 2013 13:39:28 +0000 (14:39 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 29 Mar 2013 13:39:28 +0000 (14:39 +0100)
commit26b1beb9f8275030be207d110d9ffeb6c2bae8ff
tree47f8dd46788aaf8be80a977edbaa1dd859833def
parent8f1390e23002ed57a3ac277fd0a2ba2f01afa8ea
parenta9b5e2323937c83e907907e3f74b23358851e3c6
Merge remote-tracking branch 'origin/5.4'

Conflicts:
scilab/CHANGES_5.4.X
scilab/modules/fftw/sci_gateway/c/sci_get_fftw_wisdom.c
scilab/modules/graphics/includes/math_graphics.h
scilab/modules/graphics/src/c/BasicAlgos.c
scilab/modules/graphics/src/c/math_graphics.c
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/helptools/data/pages/homepage-ru_RU.html
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_18.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_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_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_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_13.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_14.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_16.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_7.png
scilab/modules/helptools/images/_LaTeX_JKFLIPFLOP.xml_8.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_13.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_14.png
scilab/modules/helptools/images/_LaTeX_SRFLIPFLOP.xml_16.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_8.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_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_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_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_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_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

Change-Id: I99b11a81e523d29959a38e51cef1f5d279aa07b6
15 files changed:
scilab/CHANGES_5.4.X
scilab/configure
scilab/configure.ac
scilab/modules/fftw/sci_gateway/c/sci_get_fftw_wisdom.c
scilab/modules/graphics/includes/math_graphics.h
scilab/modules/graphics/src/c/BasicAlgos.c
scilab/modules/graphics/src/c/Plo2dn.c
scilab/modules/graphics/src/c/getHandleProperty/set_format_n_property.c
scilab/modules/graphics/src/c/math_graphics.c
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-ru_RU.html
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/_LaTeX_1-CVode.xml_4.png