Merge remote-tracking branch 'origin/5.4' 99/11299/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Wed, 17 Apr 2013 07:05:43 +0000 (09:05 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Wed, 17 Apr 2013 07:05:53 +0000 (09:05 +0200)
commit35a35957571779fda515b2efa03d804aeb16b978
tree89b54220238bc09fba04831aedafdacd66a52b98
parent16db9a26680b085540ee093a31b3efd8bbe0141e
parentdf8626174c1b19ddb4d09cae3b27af7961f65546
Merge remote-tracking branch 'origin/5.4'

Conflicts:
scilab/modules/helptools/etc/SciDocConf.xml.vc
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc

Change-Id: I3ab3bd05f4660386c79de3adf595a543bce13f8d
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/AxesDrawer.java