Merge remote-tracking branch 'origin/5.4' 58/10758/1
Sylvestre Ledru [Fri, 8 Mar 2013 18:00:22 +0000 (19:00 +0100)]
Conflicts:
scilab/CHANGES_5.4.X
scilab/modules/graphics/sci_gateway/c/sci_plot2d.c
scilab/modules/graphics/sci_gateway/c/sci_unglue.c
scilab/modules/graphics/sci_gateway/c/sci_xgetmouse.c
scilab/modules/helptools/images/Equation_LaTeX_10.png
scilab/modules/helptools/images/Equation_LaTeX_120.png
scilab/modules/helptools/images/Equation_LaTeX_121.png
scilab/modules/helptools/images/Equation_LaTeX_122.png
scilab/modules/helptools/images/Equation_LaTeX_123.png
scilab/modules/helptools/images/Equation_LaTeX_124.png
scilab/modules/helptools/images/Equation_LaTeX_125.png
scilab/modules/helptools/images/Equation_LaTeX_126.png
scilab/modules/helptools/images/Equation_LaTeX_127.png
scilab/modules/helptools/images/Equation_LaTeX_128.png
scilab/modules/helptools/images/Equation_LaTeX_129.png
scilab/modules/helptools/images/Equation_LaTeX_130.png
scilab/modules/helptools/images/Equation_LaTeX_131.png
scilab/modules/helptools/images/Equation_LaTeX_132.png
scilab/modules/helptools/images/Equation_LaTeX_133.png
scilab/modules/helptools/images/Equation_LaTeX_134.png
scilab/modules/helptools/images/Equation_LaTeX_135.png
scilab/modules/helptools/images/Equation_LaTeX_136.png
scilab/modules/helptools/images/Equation_LaTeX_137.png
scilab/modules/helptools/images/Equation_LaTeX_138.png
scilab/modules/helptools/images/Equation_LaTeX_139.png
scilab/modules/helptools/images/Equation_LaTeX_140.png
scilab/modules/helptools/images/Equation_LaTeX_141.png
scilab/modules/helptools/images/Equation_LaTeX_142.png
scilab/modules/helptools/images/Equation_LaTeX_143.png
scilab/modules/helptools/images/Equation_LaTeX_144.png
scilab/modules/helptools/images/Equation_LaTeX_145.png
scilab/modules/helptools/images/Equation_LaTeX_146.png
scilab/modules/helptools/images/Equation_LaTeX_147.png
scilab/modules/helptools/images/Equation_LaTeX_148.png
scilab/modules/helptools/images/Equation_LaTeX_149.png
scilab/modules/helptools/images/Equation_LaTeX_150.png
scilab/modules/helptools/images/Equation_LaTeX_151.png
scilab/modules/helptools/images/Equation_LaTeX_152.png
scilab/modules/helptools/images/Equation_LaTeX_153.png
scilab/modules/helptools/images/Equation_LaTeX_154.png
scilab/modules/helptools/images/Equation_LaTeX_155.png
scilab/modules/helptools/images/Equation_LaTeX_156.png
scilab/modules/helptools/images/Equation_LaTeX_157.png
scilab/modules/helptools/images/Equation_LaTeX_158.png
scilab/modules/helptools/images/Equation_LaTeX_159.png
scilab/modules/helptools/images/Equation_LaTeX_160.png
scilab/modules/helptools/images/Equation_LaTeX_161.png
scilab/modules/helptools/images/Equation_LaTeX_162.png
scilab/modules/helptools/images/Equation_LaTeX_163.png
scilab/modules/helptools/images/Equation_LaTeX_164.png
scilab/modules/helptools/images/Equation_LaTeX_165.png
scilab/modules/helptools/images/Equation_LaTeX_166.png
scilab/modules/helptools/images/Equation_LaTeX_167.png
scilab/modules/helptools/images/Equation_LaTeX_168.png
scilab/modules/helptools/images/Equation_LaTeX_170.png
scilab/modules/helptools/images/Equation_LaTeX_171.png
scilab/modules/helptools/images/Equation_LaTeX_172.png
scilab/modules/helptools/images/Equation_LaTeX_173.png
scilab/modules/helptools/images/Equation_LaTeX_175.png
scilab/modules/helptools/images/Equation_LaTeX_177.png
scilab/modules/helptools/images/Equation_LaTeX_178.png
scilab/modules/helptools/images/Equation_LaTeX_179.png
scilab/modules/helptools/images/Equation_LaTeX_180.png
scilab/modules/helptools/images/Equation_LaTeX_181.png
scilab/modules/helptools/images/Equation_LaTeX_182.png
scilab/modules/helptools/images/Equation_LaTeX_183.png
scilab/modules/helptools/images/Equation_LaTeX_184.png
scilab/modules/helptools/images/Equation_LaTeX_185.png
scilab/modules/helptools/images/Equation_LaTeX_186.png
scilab/modules/helptools/images/Equation_LaTeX_187.png
scilab/modules/helptools/images/Equation_LaTeX_188.png
scilab/modules/helptools/images/Equation_LaTeX_189.png
scilab/modules/helptools/images/Equation_LaTeX_190.png
scilab/modules/helptools/images/Equation_LaTeX_192.png
scilab/modules/helptools/images/Equation_LaTeX_193.png
scilab/modules/helptools/images/Equation_LaTeX_194.png
scilab/modules/helptools/images/Equation_LaTeX_197.png
scilab/modules/helptools/images/Equation_LaTeX_198.png
scilab/modules/helptools/images/Equation_LaTeX_199.png
scilab/modules/helptools/images/Equation_LaTeX_200.png
scilab/modules/helptools/images/Equation_LaTeX_201.png
scilab/modules/helptools/images/Equation_LaTeX_203.png
scilab/modules/helptools/images/Equation_LaTeX_204.png
scilab/modules/helptools/images/Equation_LaTeX_205.png
scilab/modules/helptools/images/Equation_LaTeX_206.png
scilab/modules/helptools/images/Equation_LaTeX_207.png
scilab/modules/helptools/images/Equation_LaTeX_209.png
scilab/modules/helptools/images/Equation_LaTeX_210.png
scilab/modules/helptools/images/Equation_LaTeX_211.png
scilab/modules/helptools/images/Equation_LaTeX_212.png
scilab/modules/helptools/images/Equation_LaTeX_213.png
scilab/modules/helptools/images/Equation_LaTeX_214.png
scilab/modules/helptools/images/Equation_LaTeX_216.png
scilab/modules/helptools/images/Equation_LaTeX_217.png
scilab/modules/helptools/images/Equation_LaTeX_218.png
scilab/modules/helptools/images/Equation_LaTeX_219.png
scilab/modules/helptools/images/Equation_LaTeX_220.png
scilab/modules/helptools/images/Equation_LaTeX_221.png
scilab/modules/helptools/images/Equation_LaTeX_222.png
scilab/modules/helptools/images/Equation_LaTeX_223.png
scilab/modules/helptools/images/Equation_LaTeX_224.png
scilab/modules/helptools/images/Equation_LaTeX_225.png
scilab/modules/helptools/images/Equation_LaTeX_226.png
scilab/modules/helptools/images/Equation_LaTeX_227.png
scilab/modules/helptools/images/Equation_LaTeX_228.png
scilab/modules/helptools/images/Equation_LaTeX_230.png
scilab/modules/helptools/images/Equation_LaTeX_231.png
scilab/modules/helptools/images/Equation_LaTeX_232.png
scilab/modules/helptools/images/Equation_LaTeX_233.png
scilab/modules/helptools/images/Equation_LaTeX_234.png
scilab/modules/helptools/images/Equation_LaTeX_235.png
scilab/modules/helptools/images/Equation_LaTeX_237.png
scilab/modules/helptools/images/Equation_LaTeX_238.png
scilab/modules/helptools/images/Equation_LaTeX_239.png
scilab/modules/helptools/images/Equation_LaTeX_240.png
scilab/modules/helptools/images/Equation_LaTeX_241.png
scilab/modules/helptools/images/Equation_LaTeX_242.png
scilab/modules/helptools/images/Equation_LaTeX_243.png
scilab/modules/helptools/images/Equation_LaTeX_244.png
scilab/modules/helptools/images/Equation_LaTeX_245.png
scilab/modules/helptools/images/Equation_LaTeX_246.png
scilab/modules/helptools/images/Equation_LaTeX_247.png
scilab/modules/helptools/images/Equation_LaTeX_248.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_LaTeX_252.png
scilab/modules/helptools/images/Equation_LaTeX_253.png
scilab/modules/helptools/images/Equation_LaTeX_254.png
scilab/modules/helptools/images/Equation_LaTeX_255.png
scilab/modules/helptools/images/Equation_LaTeX_256.png
scilab/modules/helptools/images/Equation_LaTeX_257.png
scilab/modules/helptools/images/Equation_LaTeX_258.png
scilab/modules/helptools/images/Equation_LaTeX_259.png
scilab/modules/helptools/images/Equation_LaTeX_260.png
scilab/modules/helptools/images/Equation_LaTeX_261.png
scilab/modules/helptools/images/Equation_LaTeX_262.png
scilab/modules/helptools/images/Equation_LaTeX_263.png
scilab/modules/helptools/images/Equation_LaTeX_264.png
scilab/modules/helptools/images/Equation_LaTeX_265.png
scilab/modules/helptools/images/Equation_LaTeX_266.png
scilab/modules/helptools/images/Equation_LaTeX_267.png
scilab/modules/helptools/images/Equation_LaTeX_268.png
scilab/modules/helptools/images/Equation_LaTeX_269.png
scilab/modules/helptools/images/Equation_LaTeX_270.png
scilab/modules/helptools/images/Equation_LaTeX_271.png
scilab/modules/helptools/images/Equation_LaTeX_272.png
scilab/modules/helptools/images/Equation_LaTeX_273.png
scilab/modules/helptools/images/Equation_LaTeX_274.png
scilab/modules/helptools/images/Equation_LaTeX_275.png
scilab/modules/helptools/images/Equation_LaTeX_276.png
scilab/modules/helptools/images/Equation_LaTeX_277.png
scilab/modules/helptools/images/Equation_LaTeX_278.png
scilab/modules/helptools/images/Equation_LaTeX_279.png
scilab/modules/helptools/images/Equation_LaTeX_280.png
scilab/modules/helptools/images/Equation_LaTeX_281.png
scilab/modules/helptools/images/Equation_LaTeX_282.png
scilab/modules/helptools/images/Equation_LaTeX_283.png
scilab/modules/helptools/images/Equation_LaTeX_284.png
scilab/modules/helptools/images/Equation_LaTeX_285.png
scilab/modules/helptools/images/Equation_LaTeX_286.png
scilab/modules/helptools/images/Equation_LaTeX_287.png
scilab/modules/helptools/images/Equation_LaTeX_4.png
scilab/modules/helptools/images/Equation_LaTeX_80.png
scilab/modules/helptools/images/Equation_LaTeX_82.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_16.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

Change-Id: Ic320786113eb56d28cdd124e507d4612c34f3161

1  2 
scilab/CHANGES_5.4.X
scilab/Makefile.am
scilab/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci

@@@ -314,8 -332,10 +334,10 @@@ Bug fixe
  * Bug #11941 fixed - show_margins() failed in 'nyquist' mode if the system is
                       in state-space form.
  
- * Bug #11952 fixed - In SciNotes, a Java exception occurred on selection of text
-                     containing a \E.
+ * Bug #11944 fixed - In SciNotes, untabify several lines did not work correctly.
+ * Bug #11952 fixed - In SciNotes, a Java exception occured on selection of text
 -                    containing a \E.
++                     containing a \E.
  
  * Bug #11954 fixed - export_to_hdf5 was not able to export the same variable twice.
  
Simple merge
Simple merge
Simple merge