summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2011-03-09 14:31:17 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2011-03-09 14:31:17 +0100
commit18bc566b490fdb18aec9d32027e98e5a5c858945 (patch)
treeed038b3137d4a284c1151eba079ca84c5f499cdc /scilab/modules/intersci
parenta41c627d7dab3a804e62dcc2cc89bcbf683363c9 (diff)
parent9db5c9e289e01bcbc8a38491c2fd4ca170ce5115 (diff)
downloadscilab-18bc566b490fdb18aec9d32027e98e5a5c858945.zip
scilab-18bc566b490fdb18aec9d32027e98e5a5c858945.tar.gz
Merge remote branch 'origin/5.3'
Conflicts: scilab/configure scilab/configure.ac scilab/etc/Info.plist scilab/libs/GetWindowsVersion/GetWindowsVersion.rc scilab/libs/LibScilab/libscilab.rc scilab/libs/LibScilab/libscilab_f2c.rc scilab/libs/MALLOC/MALLOC.rc scilab/libs/doublylinkedlist/doublylinkedlist.rc scilab/libs/dynamiclibrary/dynamiclibrary.rc scilab/libs/hashtable/hashtable.rc scilab/libs/libst/libst.rc scilab/modules/action_binding/src/c/action_binding.rc scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc scilab/modules/api_scilab/src/c/api_scilab.rc scilab/modules/arnoldi/src/c/arnoldi.rc scilab/modules/boolean/src/c/boolean.rc scilab/modules/boolean/src/fortran/boolean_f.rc scilab/modules/cacsd/src/c/cacsd.rc scilab/modules/cacsd/src/fortran/cacsd_f.rc scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.rc scilab/modules/call_scilab/src/c/call_scilab.rc scilab/modules/commons/src/c/commons.rc scilab/modules/commons/src/fortran/commons_f.rc scilab/modules/completion/src/c/completion.rc scilab/modules/completion/src/nocompletion/nocompletion.rc scilab/modules/console/src/c/console.rc scilab/modules/console/src/noconsole/noconsole.rc scilab/modules/core/includes/version.h scilab/modules/data_structures/src/c/data_structures.rc scilab/modules/data_structures/src/fortran/data_structures_f.rc scilab/modules/differential_equations/src/c/differential_equations.rc scilab/modules/differential_equations/src/fortran/differential_equations_f.rc scilab/modules/double/src/c/double.rc scilab/modules/double/src/fortran/double_f.rc scilab/modules/dynamic_link/src/c/dynamic_link.rc scilab/modules/dynamic_link/src/fortran/dynamic_link_f.rc scilab/modules/elementary_functions/src/c/elementary_functions.rc scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.rc scilab/modules/elementary_functions/src/fortran/elementary_functions_f.rc scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.rc scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.rc scilab/modules/fftw/src/c/fftw.rc scilab/modules/fftw/src/nofftw/nofftw.rc scilab/modules/fileio/src/c/fileio.rc scilab/modules/functions/src/c/functions.rc scilab/modules/functions/src/fortran/functions_f.rc scilab/modules/graphic_export/graphic_export.rc scilab/modules/graphic_export/src/nographic_export/nographic_export.rc scilab/modules/graphics/graphic.rc scilab/modules/graphics/src/nographics/nographics.rc scilab/modules/gui/src/c/gui.rc scilab/modules/gui/src/nogui/nogui.rc scilab/modules/hdf5/src/c/hdf5.rc scilab/modules/helptools/src/c/helptools.rc scilab/modules/history_browser/src/c/history_browser.rc scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc scilab/modules/history_manager/src/c/history_manager.rc scilab/modules/integer/src/c/integer.rc scilab/modules/integer/src/fortran/integer_f.rc scilab/modules/interpolation/src/c/interpolation.rc scilab/modules/interpolation/src/fortran/interpolation_f.rc scilab/modules/intersci/src/lib/intersci.rc scilab/modules/io/src/c/io.rc scilab/modules/io/src/fortran/io_f.rc scilab/modules/javasci/javasci.rc scilab/modules/jvm/src/c/libjvm.rc scilab/modules/jvm/src/nojvm/nojvm.rc scilab/modules/linear_algebra/src/c/linear_algebra.rc scilab/modules/linear_algebra/src/fortran/linear_algebra_f.rc scilab/modules/localization/src/localization.rc scilab/modules/matio/src/c/matio.rc scilab/modules/matio/src/nomatio/nomatio.rc scilab/modules/mexlib/src/libmat/libmat.rc scilab/modules/mexlib/src/libmex/libmex.rc scilab/modules/mexlib/src/libmx/libmx.rc scilab/modules/optimization/src/c/optimization.rc scilab/modules/optimization/src/fortran/optimization_f.rc scilab/modules/output_stream/src/c/output_stream.rc scilab/modules/output_stream/src/fortran/output_stream_f.rc scilab/modules/parallel/src/c/parallel.rc scilab/modules/parameters/src/c/parameters.rc scilab/modules/polynomials/src/fortran/polynomials_f.rc scilab/modules/pvm/src/c/pvm.rc scilab/modules/randlib/src/c/randlib.rc scilab/modules/randlib/src/fortran/randlib_f.rc scilab/modules/randlib/src/norandlib/norandlib.rc scilab/modules/renderer/renderer.rc scilab/modules/renderer/src/norenderer/norenderer.rc scilab/modules/scicos/src/c/noscicos/noscicos.rc scilab/modules/scicos/src/c/scicos.rc scilab/modules/scicos/src/fortran/scicos_f.rc scilab/modules/scicos/src/scicos_sundials/scicos_sundials.rc scilab/modules/scicos_blocks/src/c/scicos_blocks.rc scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.rc scilab/modules/scinotes/src/c/scinotes.rc scilab/modules/shell/src/c/shell.rc scilab/modules/signal_processing/src/c/signal_processing.rc scilab/modules/signal_processing/src/fortran/signal_processing_f.rc scilab/modules/sound/src/c/sound.rc scilab/modules/sound/src/nosound/nosound.rc scilab/modules/sparse/src/c/sparse.rc scilab/modules/sparse/src/fortran/sparse_f.rc scilab/modules/special_functions/src/c/special_functions.rc scilab/modules/special_functions/src/fortran/special_functions_f.rc scilab/modules/spreadsheet/src/c/spreadsheet.rc scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.rc scilab/modules/statistics/src/c/statistics.rc scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f.rc scilab/modules/string/src/c/string.rc scilab/modules/string/src/fortran/string_f.rc scilab/modules/symbolic/src/c/symbolic.rc scilab/modules/symbolic/src/fortran/symbolic_f.rc scilab/modules/tclsci/src/c/tclsci.rc scilab/modules/time/src/c/time.rc scilab/modules/umfpack/src/c/umfpack.rc scilab/modules/umfpack/src/noumfpack/noumfpack.rc 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/scilab_windows.rc scilab/modules/windows_tools/src/c/windows_tools.rc scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.rc scilab/modules/xcos/src/c/xcos.rc Change-Id: Ie95c1d5899b81630fd9331ac647eda651625b1b9
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/locales/intersci.pot14
-rw-r--r--scilab/modules/intersci/src/lib/intersci.rc10
2 files changed, 12 insertions, 12 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 a1fd61d..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,4,0,0 52 FILEVERSION 5,3,1,0
53 PRODUCTVERSION 5,4,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, 4, 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, 4, 0, 0" 74 VALUE "ProductVersion", "5, 3, 1, 0"
75 END 75 END
76 END 76 END
77 BLOCK "VarFileInfo" 77 BLOCK "VarFileInfo"