Merge remote-tracking branch 'origin/5.3' into simulinkimport

Conflicts:
	scilab/aclocal.m4
	scilab/configure

Change-Id: I6a0f0a544872cd5e77e74384e76c65674f701898

3 files changed, 8 insertions, 6 deletions

diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 4793091..33f9d6d 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -202,6 +202,7 @@ FGREP = @FGREP@
 FLEXDOCK = @FLEXDOCK@
 FLIBS = @FLIBS@
 FOP = @FOP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GIWS_BIN = @GIWS_BIN@
 GLUEGEN_RT = @GLUEGEN_RT@
@@ -246,6 +247,7 @@ JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
 JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
diff --git a/scilab/modules/intersci/src/lib/intersci.rc b/scilab/modules/intersci/src/lib/intersci.rc
index 06015e6..dc85c13 100644
--- a/scilab/modules/intersci/src/lib/intersci.rc
+++ b/scilab/modules/intersci/src/lib/intersci.rc
@@ -49,8 +49,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,3,0,0
- PRODUCTVERSION 5,3,0,0
+ FILEVERSION 5,3,1,0
+ PRODUCTVERSION 5,3,1,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "intersci module"
-            VALUE "FileVersion", "5, 3, 0, 0"
+            VALUE "FileVersion", "5, 3, 1, 0"
             VALUE "InternalName", "intersci module"
-            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "LegalCopyright", "Copyright (C) 2011"
             VALUE "OriginalFilename", "intersci.dll"
             VALUE "ProductName", " intersci"
-            VALUE "ProductVersion", "5, 3, 0, 0"
+            VALUE "ProductVersion", "5, 3, 1, 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/scilab/modules/intersci/version.xml b/scilab/modules/intersci/version.xml
index de2a826..61d41a1 100644
--- a/scilab/modules/intersci/version.xml
+++ b/scilab/modules/intersci/version.xml
@@ -8,5 +8,5 @@
  -->
 <!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
 <MODULE_VERSION name="intersci">
-<VERSION major="5" minor="3" maintenance="0" revision="0" string="unstable-git" />
+<VERSION major="5" minor="3" maintenance="1" revision="0" string="unstable-git" />
 </MODULE_VERSION>