Merge remote-tracking branch 'origin/5.4' 99/11299/1
Sylvestre Ledru [Wed, 17 Apr 2013 07:05:43 +0000 (09:05 +0200)]
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

1  2 
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/AxesDrawer.java