Merge remote-tracking branch 'origin/5.4' 40/10840/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 15 Mar 2013 10:10:20 +0000 (11:10 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 15 Mar 2013 10:10:29 +0000 (11:10 +0100)
commit60961d448a16a98e4ce8236361038d5f3736ce62
treeadbea433b82a31a054f74ea6999399a2fbe81ab6
parent44b9856d7ec9b2690de0c5e4359861255ccb32d3
parentd5a14d65ec2353f1ffaf4b5bd60152bd8302b060
Merge remote-tracking branch 'origin/5.4'

Change-Id: I84b83164250c67ca37d469aa49ed1b7d700eaf2a
scilab/CHANGES_5.4.X
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/src/java/org/scilab/modules/helptools/DocbookTagConverter.java