Merge remote-tracking branch 'origin/master' into YaSp
Sylvestre Ledru [Tue, 7 Aug 2012 08:09:32 +0000 (10:09 +0200)]
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:
1  2 
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

Simple merge
@@@ -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"
@@@ -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"
@@@ -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];