Merge commit 'origin/5.2' 67/167/1
authorPierre MARECHAL <pierre.marechal@scilab.org>
Tue, 20 Apr 2010 07:49:01 +0000 (09:49 +0200)
committerPierre MARECHAL <pierre.marechal@scilab.org>
Tue, 20 Apr 2010 07:49:01 +0000 (09:49 +0200)
commit0049e685a51f74e422eac722040db782f87fc823
tree00ed05ea2b592854f9702a896cfaecc580343252
parentd238528635fedd4de6f41cf693bd7d9e910a9cb7
parent04fde5001a1a891a6621019334e389bce798e07a
Merge commit 'origin/5.2'

Conflicts:
scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c

Change-Id: I2baffdab5b8100dde645c111804d9453ed018906
14 files changed:
scilab/CHANGES_5.2.X
scilab/modules/atoms/macros/atomsAutoloadAdd.sci
scilab/modules/atoms/macros/atomsIsInstalled.sci
scilab/modules/atoms/macros/atomsRepositoryAdd.sci
scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONread.sci
scilab/modules/atoms/macros/atoms_internals/atomsExtract.sci
scilab/modules/atoms/macros/atoms_internals/atomsGetInstalledPath.sci
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/jvm.iss
scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
scilab/modules/matio/src/c/matfile_manager.c
scilab/modules/scicos_blocks/macros/Misc/DIFF_f.sci
scilab/modules/scicos_blocks/macros/Sources/FROMWSB.sci
scilab/modules/scicos_blocks/macros/Sources/FROMWS_c.sci