Merge remote-tracking branch 'origin/master' into YaSp 59/7959/2
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 16 Jul 2012 08:58:23 +0000 (10:58 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 16 Jul 2012 09:51:43 +0000 (11:51 +0200)
commit7a7b962ae0b4820923b1ef7f6a99efa1929fc9d5
treed8e049f4214d2e71200047f0eb9e78f6d0fca656
parent9db9df0387e4cf6056b7cf131741d3692a375086
parent98baf3d12904f5aec5c9340ab6e231db92738b40
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
SEP/INDEX
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/core/includes/machine.h.in
scilab/modules/core/tests/unit_tests/for.dia.ref
scilab/modules/core/tests/unit_tests/for.tst
scilab/modules/fileio/sci_gateway/c/sci_newest.c
scilab/modules/fileio/src/c/mgetl.c
scilab/modules/functions/src/c/librarieslist.c
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/graphics/sci_gateway/c/sci_xset.c
scilab/modules/gui/Makefile.in
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/hdf5/src/c/h5_writeDataToFile.c
scilab/modules/javasci/tests/unit_tests/Strings2.dia.ref
scilab/modules/localization/includes/setgetlanguage.h
scilab/modules/preferences/src/c/getScilabPreference.c
scilab/tools/innosetup/components.iss

Change-Id: I75a0012945528a3dfdf228d4235240faf977a098
47 files changed:
scilab/configure
scilab/configure.ac
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/elementary_functions/elementary_functions.iss
scilab/modules/fileio/fileio.iss
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/graphics/sci_gateway/c/sci_xget.c
scilab/modules/graphics/sci_gateway/c/sci_xset.c
scilab/modules/graphics/src/c/DrawObjects.c
scilab/modules/graphics/src/c/InitObjects.c
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/images/icons/aboutscilab.png
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/sci_gateway/c/sci_mpopup.c
scilab/modules/gui/sci_gateway/c/sci_toolbar.c
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/gui/sci_gateway/c/sci_uimenu.c
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/includes/setgetlanguage.h
scilab/modules/localization/src/localization.vcxproj
scilab/modules/localization/src/localization.vcxproj.filters
scilab/modules/mexlib/mexlib.iss
scilab/modules/parameters/parameters.iss
scilab/modules/preferences/src/c/getScilabPreference.c
scilab/modules/preferences/src/jni/ScilabPreferences.hxx
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/renderer.iss
scilab/modules/renderer/renderer.vcxproj
scilab/modules/renderer/renderer.vcxproj.filters
scilab/tools/innosetup/components.iss