Merge remote-tracking branch 'origin/master' into YaSp 58/16458/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 7 May 2015 09:05:01 +0000 (11:05 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 7 May 2015 09:05:01 +0000 (11:05 +0200)
commitdb59111b1cfbdd1b27ed165184da1997abd8cdf4
tree2c35c5fb748683e50e738cb25742954593badc11
parent81a082dfca7c17dd684b2bef9ce35b61e162e045
parentee6e4f420115ee206a75c41382970daf89f71f78
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/differential_equations/sci_gateway/fortran/sci_f_odedc.f
scilab/modules/differential_equations/tests/unit_tests/intg.dia.ref
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/mpi/Makefile.am
scilab/modules/mpi/Makefile.in
scilab/modules/overloading/macros/%hm_sum.sci
scilab/modules/scicos/sci_gateway/c/sci_data2sig.c

Change-Id: Ie2ec359732388de39d230cb2fe01f2e659c6bc26
14 files changed:
scilab/modules/differential_equations/tests/unit_tests/intg.dia.ref
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_colors_property.c
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/set_colors_property.c
scilab/modules/scicos/sci_gateway/cpp/sci_data2sig.cpp
scilab/modules/scicos/src/c/scicos.c