Merge remote-tracking branch 'origin/master' into YaSp 60/11660/1
authorCedric Delamarre <cedric.delamarre@scilab-enterprises.com>
Thu, 6 Jun 2013 13:07:27 +0000 (15:07 +0200)
committerCedric Delamarre <cedric.delamarre@scilab-enterprises.com>
Thu, 6 Jun 2013 13:07:27 +0000 (15:07 +0200)
commit3714e32f5b564e3d940a4f8ba1a6832fcb999a01
tree5b77bd4eb8dfc50ab12869471b9d77a2a322008d
parentd704a11035db8d34595301cf4130b7f8e7ae2b27
parentcfb2fa6daeb61556c35a20597061930dfa6b8b99
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/Makefile.am
scilab/Makefile.in
scilab/etc/scilab.quit
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/statistics/tests/unit_tests/cdfbet.tst
scilab/modules/statistics/tests/unit_tests/cdfchi.tst
scilab/modules/xcos/includes/gw_xcos.h
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalGenerateAllIcons.cpp
scilab/modules/xcos/src/cpp/xcosUtilities.cpp

Change-Id: Ia766acf2232a5f5bd45f9672f2a1cd231bfe7437
16 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/bin/scilab
scilab/etc/scilab.quit
scilab/modules/core/src/c/TerminateCore.c
scilab/modules/graphics/macros/ged.sci
scilab/modules/javasci/src/c/javasci2_helper.h
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/statistics/tests/unit_tests/cdfchi.tst
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/includes/gw_xcos.h
scilab/modules/xcos/src/c/xcos.vcxproj
scilab/modules/xcos/src/c/xcos.vcxproj.filters
scilab/modules/xcos/src/cpp/xcosUtilities.cpp