Merge remote-tracking branch 'origin/5.4' 23/11123/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Thu, 28 Mar 2013 08:47:13 +0000 (09:47 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Thu, 28 Mar 2013 08:47:13 +0000 (09:47 +0100)
commitbc3108cde836d7c25596a5ed95c8e540d397d630
treed42ef72d7ba9f92d281f86495e8eac7871b27c59
parentba0f91014afeacb93ffeae0e413ef76b63585090
parent0cc21e2ebefe65bf1d71d82370f8732079842afd
Merge remote-tracking branch 'origin/5.4'

Conflicts:
scilab/modules/external_objects/src/cpp/ScilabObjects.cpp
scilab/modules/graphics/sci_gateway/c/sci_xfpolys.c
scilab/modules/graphics/src/c/getHandleProperty/set_format_n_property.c

Change-Id: I37f19135fb1a0a2c59498222b454124017308f00
16 files changed:
scilab/CHANGES_5.4.X
scilab/modules/external_objects/src/cpp/ScilabObjects.cpp
scilab/modules/external_objects/src/cpp/array.cpp
scilab/modules/external_objects/src/cpp/cast.cpp
scilab/modules/external_objects/src/cpp/doubleExclam_invoke.cpp
scilab/modules/external_objects/src/cpp/getEnvId.cpp
scilab/modules/external_objects/src/cpp/getEnvironmentName.cpp
scilab/modules/external_objects/src/cpp/getFields.cpp
scilab/modules/external_objects/src/cpp/getMethods.cpp
scilab/modules/external_objects/src/cpp/getNamedVariable.cpp
scilab/modules/external_objects/src/cpp/getRepresentation.cpp
scilab/modules/external_objects/src/cpp/getsetOptions.cpp
scilab/modules/graphics/locales/graphics.pot
scilab/modules/graphics/sci_gateway/c/sci_xfpolys.c
scilab/modules/graphics/src/c/getHandleProperty/set_format_n_property.c
scilab/modules/string/Makefile.in