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

diff --cc scilab/contrib/Makefile.in
Simple merge

diff --cc scilab/modules/console/src/c/cmdLine/getKey.c
Simple merge

diff --cc scilab/modules/fileio/macros/%_listvarinfile.sci
Simple merge

diff --cc scilab/modules/helptools/macros/xmltoformat.sci
Simple merge

diff --cc scilab/modules/jvm/src/c/getJvmOptions.c
Simple merge

diff --cc scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp
Simple merge

diff --cc scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
index b408c3c,2d8132d..df41fa2
--- 1/scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
--- 2/scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
+++ b/scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
@@@ -105,9 -105,9 +105,9 @@@ BEGI
      BEGIN
          BLOCK "040c04b0"
          BEGIN
-             VALUE "CompanyName", "Consortium Scilab (DIGITEO)"
+             VALUE "CompanyName", "Scilab Enterprises"
 -            VALUE "FileDescription", "Scilab 5.4.0 (NO GUI)"
 -            VALUE "FileVersion", "5, 4, 0, 0"
 +            VALUE "FileDescription", "Scilab 6.0.0 (NO GUI)"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "WScilex"
              VALUE "LegalCopyright", "Copyright (C) 2012"
              VALUE "OriginalFilename", "WScilex.exe"

diff --cc scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
index 9049144,7c66959..a01d7b5
--- 1/scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
--- 2/scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
+++ b/scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
@@@ -73,9 -73,9 +73,9 @@@ BEGI
      BEGIN
          BLOCK "040c04b0"
          BEGIN
-             VALUE "CompanyName", "Consortium Scilab (DIGITEO)"
+             VALUE "CompanyName", "Scilab Enterprises"
 -            VALUE "FileDescription", "Scilab 5.4.0 (GUI)"
 -            VALUE "FileVersion", "5, 4, 0, 0"
 +            VALUE "FileDescription", "Scilab 6.0.0 (GUI)"
 +            VALUE "FileVersion", "6, 0, 0, 0"
              VALUE "InternalName", "WScilex"
              VALUE "LegalCopyright", "Copyright (C) 2012"
              VALUE "OriginalFilename", "WScilex.exe"

diff --cc scilab/modules/windows_tools/src/c/scilab_windows/console.c
index dc8b47f,f87544e..5ec2522
--- 1/scilab/modules/windows_tools/src/c/scilab_windows/console.c
--- 2/scilab/modules/windows_tools/src/c/scilab_windows/console.c
+++ b/scilab/modules/windows_tools/src/c/scilab_windows/console.c
@@@ -22,9 -22,9 +22,9 @@@
  #include "WndThread.h"
  #include "console.h"
  #include "version.h"
 -#include "strdup_windows.h"
 +#include "os_strdup.h"
  /*--------------------------------------------------------------------------*/
- #define NameConsole "Console" 
+ #define NameConsole "Console"
  /*--------------------------------------------------------------------------*/
  static CONSOLE_SCREEN_BUFFER_INFO csbiInfoSave;
  static char ScilexConsoleName[MAX_PATH];

diff --cc scilab/modules/xml/sci_gateway/cpp/sci_xmlRead.cpp
Simple merge

diff --cc scilab/modules/xml/sci_gateway/cpp/sci_xmlRemove.cpp
Simple merge

diff --cc scilab/modules/xml/sci_gateway/cpp/sci_xmlSetAttributes.cpp
Simple merge

diff --cc scilab/modules/xml/sci_gateway/cpp/sci_xmlValidate.cpp
Simple merge

diff --cc scilab/modules/xml/sci_gateway/cpp/sci_xmlValidationFile.cpp
Simple merge

diff --cc scilab/modules/xml/sci_gateway/cpp/sci_xmlXPath.cpp
Simple merge