Merge remote-tracking branch 'origin/master' into YaSp
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 7 Aug 2012 08:09:32 +0000 (10:09 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 7 Aug 2012 08:09:51 +0000 (10:09 +0200)
commitd77b1f4e5bd0ed159709127e458f8f1721489110
tree5241c8dac954e170ffcca763ba120c10698395c5
parent6e31969923f7ff639b2e76c36a49bfcefeba4ee6
parent41a8e1f91f0216c74e2a0c8e4e657a348311ce8a
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/core/src/c/parse.c
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/io/sci_gateway/c/sci_save.c
scilab/modules/linear_algebra/help/en_US/lsq.xml
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/scilab_windows/console.c

Change-Id: Id979cc2a966ca7241d2ab2e82611516c80e104ef
15 files changed:
scilab/contrib/Makefile.in
scilab/modules/console/src/c/cmdLine/getKey.c
scilab/modules/fileio/macros/%_listvarinfile.sci
scilab/modules/helptools/macros/xmltoformat.sci
scilab/modules/jvm/src/c/getJvmOptions.c
scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/scilab_windows/console.c
scilab/modules/xml/sci_gateway/cpp/sci_xmlRead.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlRemove.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlSetAttributes.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlValidate.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlValidationFile.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlXPath.cpp