Merge remote-tracking branch 'origin/5.4' 83/10883/1
Sylvestre Ledru [Tue, 19 Mar 2013 09:56:17 +0000 (10:56 +0100)]
Conflicts:
scilab/modules/helptools/images/_LaTeX_karmarkar.xml_4.png
scilab/modules/helptools/images/_LaTeX_karmarkar.xml_5.png
scilab/modules/helptools/images/optim_sa_1.png

Change-Id: If7badd1c89369dcf4fbe063a5d6aa893e46a831c

12 files changed:
1  2 
scilab/CHANGES_5.4.X
scilab/configure
scilab/configure.ac
scilab/modules/core/src/c/stack2.c
scilab/modules/graphics/locales/graphics.pot
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/_LaTeX_karmarkar.xml_4.png
scilab/modules/helptools/images/_LaTeX_karmarkar.xml_5.png
scilab/modules/helptools/images/optim_sa_1.png
scilab/modules/string/Makefile.in
scilab/modules/umfpack/sci_gateway/c/sci_taucs_chinfo.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_luinfo.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge