summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2011-03-07 09:52:16 +0100
committerClément DAVID <clement.david@scilab.org>2011-03-07 09:52:16 +0100
commit2835e08091d79405f8a4ef74787b5aace3e935ab (patch)
tree76ee3a864662a8fba9f395735a60ae4a0f9e8e4b /scilab/modules/intersci
parent6c742c35f0a9a138f765e434e294273a262f8fd5 (diff)
parent0118710f9d4ca4c1843a40d7355add417b510001 (diff)
downloadscilab-2835e08091d79405f8a4ef74787b5aace3e935ab.zip
scilab-2835e08091d79405f8a4ef74787b5aace3e935ab.tar.gz
Merge remote-tracking branch 'origin/5.3' into simulinkimport
Conflicts: scilab/aclocal.m4 scilab/configure Change-Id: I6a0f0a544872cd5e77e74384e76c65674f701898
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in2
-rw-r--r--scilab/modules/intersci/src/lib/intersci.rc10
-rw-r--r--scilab/modules/intersci/version.xml2
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@
202FLEXDOCK = @FLEXDOCK@ 202FLEXDOCK = @FLEXDOCK@
203FLIBS = @FLIBS@ 203FLIBS = @FLIBS@
204FOP = @FOP@ 204FOP = @FOP@
205GENHTML = @GENHTML@
205GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ 206GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
206GIWS_BIN = @GIWS_BIN@ 207GIWS_BIN = @GIWS_BIN@
207GLUEGEN_RT = @GLUEGEN_RT@ 208GLUEGEN_RT = @GLUEGEN_RT@
@@ -246,6 +247,7 @@ JROSETTA_API = @JROSETTA_API@
246JROSETTA_ENGINE = @JROSETTA_ENGINE@ 247JROSETTA_ENGINE = @JROSETTA_ENGINE@
247JUNIT = @JUNIT@ 248JUNIT = @JUNIT@
248LAPACK_LIBS = @LAPACK_LIBS@ 249LAPACK_LIBS = @LAPACK_LIBS@
250LCOV = @LCOV@
249LD = @LD@ 251LD = @LD@
250LDFLAGS = @LDFLAGS@ 252LDFLAGS = @LDFLAGS@
251LIBICONV = @LIBICONV@ 253LIBICONV = @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
49// 49//
50 50
51VS_VERSION_INFO VERSIONINFO 51VS_VERSION_INFO VERSIONINFO
52 FILEVERSION 5,3,0,0 52 FILEVERSION 5,3,1,0
53 PRODUCTVERSION 5,3,0,0 53 PRODUCTVERSION 5,3,1,0
54 FILEFLAGSMASK 0x17L 54 FILEFLAGSMASK 0x17L
55#ifdef _DEBUG 55#ifdef _DEBUG
56 FILEFLAGS 0x1L 56 FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
66 BLOCK "040c04b0" 66 BLOCK "040c04b0"
67 BEGIN 67 BEGIN
68 VALUE "FileDescription", "intersci module" 68 VALUE "FileDescription", "intersci module"
69 VALUE "FileVersion", "5, 3, 0, 0" 69 VALUE "FileVersion", "5, 3, 1, 0"
70 VALUE "InternalName", "intersci module" 70 VALUE "InternalName", "intersci module"
71 VALUE "LegalCopyright", "Copyright (C) 2010" 71 VALUE "LegalCopyright", "Copyright (C) 2011"
72 VALUE "OriginalFilename", "intersci.dll" 72 VALUE "OriginalFilename", "intersci.dll"
73 VALUE "ProductName", " intersci" 73 VALUE "ProductName", " intersci"
74 VALUE "ProductVersion", "5, 3, 0, 0" 74 VALUE "ProductVersion", "5, 3, 1, 0"
75 END 75 END
76 END 76 END
77 BLOCK "VarFileInfo" 77 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 @@
8 --> 8 -->
9<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd"> 9<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
10<MODULE_VERSION name="intersci"> 10<MODULE_VERSION name="intersci">
11<VERSION major="5" minor="3" maintenance="0" revision="0" string="unstable-git" /> 11<VERSION major="5" minor="3" maintenance="1" revision="0" string="unstable-git" />
12</MODULE_VERSION> 12</MODULE_VERSION>