summaryrefslogtreecommitdiffstats
path: root/scilab/modules/texmacs
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-20 09:49:01 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-20 09:49:01 +0200
commit0049e685a51f74e422eac722040db782f87fc823 (patch)
tree00ed05ea2b592854f9702a896cfaecc580343252 /scilab/modules/texmacs
parentd238528635fedd4de6f41cf693bd7d9e910a9cb7 (diff)
parent04fde5001a1a891a6621019334e389bce798e07a (diff)
downloadscilab-0049e685a51f74e422eac722040db782f87fc823.zip
scilab-0049e685a51f74e422eac722040db782f87fc823.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c Change-Id: I2baffdab5b8100dde645c111804d9453ed018906
Diffstat (limited to 'scilab/modules/texmacs')
-rw-r--r--scilab/modules/texmacs/locales/fr_FR/texmacs.po2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/texmacs/locales/fr_FR/texmacs.po b/scilab/modules/texmacs/locales/fr_FR/texmacs.po
index c002cb1..0b9ae56 100644
--- a/scilab/modules/texmacs/locales/fr_FR/texmacs.po
+++ b/scilab/modules/texmacs/locales/fr_FR/texmacs.po
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:53+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19 19
20 20