summaryrefslogtreecommitdiffstats
path: root/scilab/modules/simulated_annealing
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-11-17 16:25:22 +0100
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-11-17 16:25:22 +0100
commitb81519ef887d534d7a164d37e0e4d2157063e72c (patch)
tree44dc74d7816534ca44e71f3cad0b9f7f63b42921 /scilab/modules/simulated_annealing
parent750cea290e8ef1e609bb5a9b0c43af18c77870ee (diff)
parent9b6bb8956846e9ed99d40318cf79a53cd7662c53 (diff)
downloadscilab-b81519ef887d534d7a164d37e0e4d2157063e72c.zip
scilab-b81519ef887d534d7a164d37e0e4d2157063e72c.tar.gz
Merge commit 'origin/5.2'
Diffstat (limited to 'scilab/modules/simulated_annealing')
-rw-r--r--scilab/modules/simulated_annealing/locales/en_US/simulated_annealing.pot2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/simulated_annealing/locales/en_US/simulated_annealing.pot b/scilab/modules/simulated_annealing/locales/en_US/simulated_annealing.pot
index 517f625..17e615c 100644
--- a/scilab/modules/simulated_annealing/locales/en_US/simulated_annealing.pot
+++ b/scilab/modules/simulated_annealing/locales/en_US/simulated_annealing.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: 2009-11-09 14:21+0100\n" 17"Revision-Date: 2009-11-17 16:13+0100\n"
18 18
19# File: macros/optim_sa.sci, line: 119 19# File: macros/optim_sa.sci, line: 119
20#, c-format 20#, c-format