Merge remote-tracking branch 'origin/master' into yasp 07/11507/2
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Wed, 15 May 2013 09:15:11 +0000 (11:15 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Wed, 15 May 2013 11:04:03 +0000 (13:04 +0200)
commit1f55b7dae59235a9eedb10221feaaebb41c30045
tree42564d63f326f18423287f890a2dae5747e025b8
parenta54e5f92bf0e017a91add16c0ed1cf636444b43c
parent4214f7fbf1447a47f54115ddf7a562bdad3433a3
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/configure
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/api_scilab.vcxproj.filters
scilab/modules/differential_equations/sci_gateway/fortran/sci_f_dasrt.f
scilab/modules/differential_equations/sci_gateway/fortran/sci_f_dassl.f
scilab/modules/fileio/src/c/mput.c
scilab/modules/matio/sci_gateway/c/gw_matio.c
scilab/modules/matio/sci_gateway/c/sci_matfile_close.c
scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
scilab/modules/matio/sci_gateway/c/sci_matfile_open.c
scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
scilab/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
scilab/modules/matio/src/c/CreateBooleanVariable.c
scilab/modules/matio/src/c/CreateCellVariable.c
scilab/modules/matio/src/c/CreateCharVariable.c
scilab/modules/matio/src/c/CreateDoubleVariable.c
scilab/modules/matio/src/c/CreateHyperMatrixVariable.c
scilab/modules/matio/src/c/CreateIntegerVariable.c
scilab/modules/matio/src/c/CreateMatlabVariable.c
scilab/modules/matio/src/c/CreateMatlabVariable.h
scilab/modules/matio/src/c/CreateSparseVariable.c
scilab/modules/matio/src/c/CreateStructVariable.c
scilab/modules/matio/src/c/GetCellVariable.c
scilab/modules/matio/src/c/GetCharVariable.c
scilab/modules/matio/src/c/GetDoubleVariable.c
scilab/modules/matio/src/c/GetIntegerVariable.c
scilab/modules/matio/src/c/GetMatlabVariable.c
scilab/modules/matio/src/c/GetMatlabVariable.h
scilab/modules/matio/src/c/GetMlistVariable.c
scilab/modules/matio/src/c/GetSparseVariable.c
scilab/modules/matio/src/c/GetStructVariable.c

Change-Id: Ic70fd5637f46587d52588a931d6a67148401a094
29 files changed:
scilab/.gitignore
scilab/configure
scilab/configure.ac
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/api_scilab.vcxproj.filters
scilab/modules/api_scilab/includes/api_scilab.h
scilab/modules/core/includes/machine.h.in
scilab/modules/matio/sci_gateway/c/sci_matfile_close.c
scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
scilab/modules/matio/sci_gateway/c/sci_matfile_open.c
scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
scilab/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
scilab/modules/matio/src/c/CreateBooleanVariable.c
scilab/modules/matio/src/c/CreateCellVariable.c
scilab/modules/matio/src/c/CreateCharVariable.c
scilab/modules/matio/src/c/CreateDoubleVariable.c
scilab/modules/matio/src/c/CreateHyperMatrixVariable.c
scilab/modules/matio/src/c/CreateIntegerVariable.c
scilab/modules/matio/src/c/CreateMatlabVariable.c
scilab/modules/matio/src/c/CreateMatlabVariable.h
scilab/modules/matio/src/c/CreateSparseVariable.c
scilab/modules/matio/src/c/CreateStructVariable.c
scilab/modules/matio/src/c/GetCellVariable.c
scilab/modules/matio/src/c/GetCharVariable.c
scilab/modules/matio/src/c/GetMatlabVariable.h
scilab/modules/matio/src/c/GetMlistVariable.c
scilab/modules/matio/src/c/GetSparseVariable.c