gitweb.scilab.org Git - scilab.git/commit

author	Vincent COUVERT <vincent.couvert@scilab-enterprises.com>
	Thu, 7 May 2015 09:05:01 +0000 (11:05 +0200)
committer	Vincent COUVERT <vincent.couvert@scilab-enterprises.com>
	Thu, 7 May 2015 09:05:01 +0000 (11:05 +0200)
commit	db59111b1cfbdd1b27ed165184da1997abd8cdf4
tree	2c35c5fb748683e50e738cb25742954593badc11	tree \| snapshot
parent	81a082dfca7c17dd684b2bef9ce35b61e162e045	commit \| diff
parent	ee6e4f420115ee206a75c41382970daf89f71f78	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/Makefile.am	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/Makefile.in	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/graphics.vcxproj	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/graphics.vcxproj.filters	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/macros/%h_p.sci	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/src/c/getHandleProperty/get_colors_property.c	\|	diff2 \|	blob \| history
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/src/c/getHandleProperty/set_colors_property.c	\|	diff2 \|	blob \| history
scilab/modules/scicos/sci_gateway/cpp/sci_data2sig.cpp	diff1 \|	\|	blob \| history
scilab/modules/scicos/src/c/scicos.c	diff1 \|	diff2 \|	blob \| history

Scilab official GIT repository

RSS Atom

scilab/modules/differential_equations/tests/unit_tests/intg.dia.ref	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/Makefile.am	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/Makefile.in	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/graphics.vcxproj	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/graphics.vcxproj.filters	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/macros/%h_p.sci	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/src/c/getHandleProperty/get_colors_property.c	\|	diff2 \|	blob \| history
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h	diff1 \|	diff2 \|	blob \| history
scilab/modules/graphics/src/c/getHandleProperty/set_colors_property.c	\|	diff2 \|	blob \| history
scilab/modules/scicos/sci_gateway/cpp/sci_data2sig.cpp	diff1 \|	\|	blob \| history
scilab/modules/scicos/src/c/scicos.c	diff1 \|	diff2 \|	blob \| history