summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2011-03-21 11:33:25 +0100
committerClément DAVID <clement.david@scilab.org>2011-03-21 11:36:15 +0100
commit9af43a0b6f18cf675322538deef041c0a0f820c9 (patch)
tree03ff183a9f77b47c993a1a73c4b7ee228686ca33 /scilab/modules/intersci
parent884e6420b468a9fb49098588ccae22708b07da29 (diff)
parent43663db066140c59935691f43f4ba95199a45543 (diff)
downloadscilab-9af43a0b6f18cf675322538deef041c0a0f820c9.zip
scilab-9af43a0b6f18cf675322538deef041c0a0f820c9.tar.gz
Merge remote-tracking branch 'origin/5.3' into simulinkimport
Conflicts: scilab/configure scilab/modules/xcos/build.xml Change-Id: I946b2a2cae1525e123268ce3db5a561a88f99645
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/locales/intersci.pot14
-rw-r--r--scilab/modules/intersci/src/lib/intersci.rc8
2 files changed, 11 insertions, 11 deletions
diff --git a/scilab/modules/intersci/locales/intersci.pot b/scilab/modules/intersci/locales/intersci.pot
index d6d295b..d0ae21f 100644
--- a/scilab/modules/intersci/locales/intersci.pot
+++ b/scilab/modules/intersci/locales/intersci.pot
@@ -1,18 +1,18 @@
1# Localization of the module intersci 1# Localization of the module intersci
2# Please see in SCI/tools/localization for localization management 2# Please see in SCI/tools/localization for localization management
3# Copyright (C) 2007/2008 - INRIA / Scilab 3# Copyright (C) 2007-2008 - INRIA
4# Copyright (C) 2008-2011 - DIGITEO
4# This file is distributed under the same license as the Scilab package. 5# This file is distributed under the same license as the Scilab package.
5# Sylvestre Ledru <sylvestre.ledru@inria.fr>, 2007/2008.
6# 6#
7msgid "" 7msgid ""
8msgstr "" 8msgstr ""
9"Project-Id-Version: Scilab\n" 9"Project-Id-Version: Scilab\n"
10"Report-Msgid-Bugs-To: <localization@scilab.org>\n" 10"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
11"POT-Creation-Date: 2007-09-27 16:24+0200\n" 11"POT-Creation-Date: 2011-03-09 11:38+0100\n"
12"Last-Translator: Sylvestre Ledru <sylvestre.ledru@inria.fr>\n" 12"Last-Translator: Sylvestre Ledru <sylvestre.ledru@scilab.org>\n"
13"Language-Team: Scilab Localization <localization@scilab.org>\n" 13"Language-Team: Scilab Localization <localization@lists.scilab.org>\n"
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-11-18 15:37+0100\n" 17"Revision-Date: 2011-03-09 14:19+0100\n"
18 18
diff --git a/scilab/modules/intersci/src/lib/intersci.rc b/scilab/modules/intersci/src/lib/intersci.rc
index dc85c13..fd2be29 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,1,0 52 FILEVERSION 5,3,2,0
53 PRODUCTVERSION 5,3,1,0 53 PRODUCTVERSION 5,3,2,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, 1, 0" 69 VALUE "FileVersion", "5, 3, 2, 0"
70 VALUE "InternalName", "intersci module" 70 VALUE "InternalName", "intersci module"
71 VALUE "LegalCopyright", "Copyright (C) 2011" 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, 1, 0" 74 VALUE "ProductVersion", "5, 3, 2, 0"
75 END 75 END
76 END 76 END
77 BLOCK "VarFileInfo" 77 BLOCK "VarFileInfo"