Merge remote-tracking branch 'origin/5.4' 69/10969/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Sat, 23 Mar 2013 16:57:14 +0000 (17:57 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Sat, 23 Mar 2013 16:57:14 +0000 (17:57 +0100)
commit458e666c04bc06003da5b7d794083dd92b4e4847
tree157fe9f12b5bec023062cd52f2cf48b7853f1f6d
parent840d6894c1cb550a6e370fd1353d7f72881f23dd
parentf496d57e2c9fd20573e0113489a5dde0f037b9ab
Merge remote-tracking branch 'origin/5.4'

Conflicts:
scilab/modules/helptools/images/_MathML_levin.xml_1.png
scilab/modules/helptools/images/_MathML_levin.xml_2.png

Change-Id: I3b1626a309c1d0cdab1a6c613f58e382e37c7534
scilab/CHANGES_5.4.X
scilab/modules/core/Makefile.in
scilab/modules/graphic_objects/Makefile.in
scilab/modules/helptools/etc/images_md5.txt