summaryrefslogtreecommitdiffstats
path: root/scilab/modules/compatibility_functions
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-13 17:17:50 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-13 17:21:02 +0200
commit20a7ab6eb97d9874f526c629e4e6303068fb52de (patch)
treeccc506317f6261dd4af2b5b825f52cc620430c66 /scilab/modules/compatibility_functions
parent823b6599b463edcab758f8dda6d0c35a3083b4fc (diff)
parenta163f33f753262f83d10aacdbb638d1141ad0a72 (diff)
downloadscilab-20a7ab6eb97d9874f526c629e4e6303068fb52de.zip
scilab-20a7ab6eb97d9874f526c629e4e6303068fb52de.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci Change-Id: I629a8ab712ad71e42fac6d4e140fbcb75250b896
Diffstat (limited to 'scilab/modules/compatibility_functions')
-rw-r--r--scilab/modules/compatibility_functions/locales/en_US/compatibility_functions.pot2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/compatibility_functions/locales/en_US/compatibility_functions.pot b/scilab/modules/compatibility_functions/locales/en_US/compatibility_functions.pot
index c468fe1..0dc2b9c 100644
--- a/scilab/modules/compatibility_functions/locales/en_US/compatibility_functions.pot
+++ b/scilab/modules/compatibility_functions/locales/en_US/compatibility_functions.pot
@@ -14,7 +14,7 @@ msgstr ""
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-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/mtlb_fprintf.sci, line: 57 19# File: macros/mtlb_fprintf.sci, line: 57
20# File: macros/mtlb_fprintf.sci, line: 114 20# File: macros/mtlb_fprintf.sci, line: 114