Merge remote-tracking branch 'origin/master' into YaSp 36/10236/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Wed, 16 Jan 2013 17:32:25 +0000 (18:32 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Wed, 16 Jan 2013 17:32:25 +0000 (18:32 +0100)
commit2b1dc96a03d239085247636647a9e82d6e4bb72b
treed791c1d4514b31b473dd646afb0877d3d9a4cba5
parentd57a2004e4abc482816fad9ca6a20da153c4ec4e
parentfabc4725ab73d8d3bf93a0fd617e046213e541f5
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/localization/src/c/InitializeLocalization.c

Change-Id: I3ae8e91fa6eb97b9006807b600d22484fc1aaef8
12 files changed:
scilab/configure
scilab/configure.ac
scilab/etc/scilab.start
scilab/modules/call_scilab/src/c/SendScilabJobs.c
scilab/modules/graphics/sci_gateway/c/sci_delete.c
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/localization/src/c/InitializeLocalization.c
scilab/modules/renderer/renderer.iss
scilab/modules/scicos/src/c/scicos.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvTextScan.c
scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp