Merge remote-tracking branch 'origin/5.4' 46/11046/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Wed, 27 Mar 2013 11:19:34 +0000 (12:19 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Wed, 27 Mar 2013 11:19:34 +0000 (12:19 +0100)
commit7ab541caa092011a15250ee5f8bc4cb4d01f2f58
tree6fa66a57c5d0eb60893f383e2ab1bb56ca270f6e
parenteb46b933a13a65f877777a32099af2e79fe8a451
parent9ff07ee2568c9ad46017be0d91a5c9bfb712c602
Merge remote-tracking branch 'origin/5.4'

Conflicts:
scilab/CHANGES_5.4.X
scilab/modules/graphics/src/c/getHandleProperty/set_sub_tics_property.c

Change-Id: Iab7473c801f3846580fc4561fbefa11b98973f2a
scilab/CHANGES_5.4.X
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/configure.ac
scilab/modules/graphics/src/c/getHandleProperty/set_sub_tics_property.c
scilab/modules/helptools/etc/images_md5.txt