Merge remote-tracking branch 'origin/master' into YaSp 54/16154/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 13 Mar 2015 10:52:47 +0000 (11:52 +0100)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 13 Mar 2015 10:52:47 +0000 (11:52 +0100)
commit4e5fde2de1520cdec08c99cc99b2a3ddd955c2c1
tree908a3ba1aa168124432ee31cd2ded517d7f4bdfc
parente9516e982420029d6a5a0080cf35793ff4fa68ff
parenta337d144271aa0fc3737071de9dfea3c8fbcc8dc
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/configure
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectData.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectDataJNI.java
scilab/modules/graphics/src/c/getHandleProperty/get_triangles_property.c
scilab/modules/statistics/macros/st_deviation.sci
scilab/modules/xml/src/cpp/VariableScope.cpp
scilab/modules/xml/src/cpp/VariableScope.hxx
scilab/modules/xml/src/cpp/XMLDocument.cpp

Change-Id: Ic4c2565536094b03e3bbd6b14bf6954e57fe1576
20 files changed:
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectData.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ObjectDataJNI.java
scilab/modules/graphic_objects/src/jni/ObjectData.i
scilab/modules/graphic_objects/src/jni/ObjectData_wrap.c
scilab/modules/graphics/sci_gateway/c/sci_fec.c
scilab/modules/graphics/src/c/BuildObjects.c
scilab/modules/graphics/src/c/getHandleProperty/get_triangles_property.c
scilab/modules/graphics/src/c/sciCall.c
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/xml/src/cpp/VariableScope.cpp
scilab/modules/xml/src/cpp/VariableScope.hxx
scilab/modules/xml/src/cpp/XMLDocument.cpp
scilab/modules/xml/src/cpp/XMLDocument.hxx