summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-04-29 11:28:51 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-04-29 11:28:51 +0200
commit8c1dc2af8c3fcafa7ce82faaec2e0464454aaa6c (patch)
tree46070d5aa08f939c9db448dac377f0a90baf9a16 /scilab/modules/intersci
parent5ea13b7ee0c0790f6ef5d01ce0e074f2955e0bee (diff)
parent00c1dc5237830cd92f8fb93cf6bbf713c4126213 (diff)
downloadscilab-8c1dc2af8c3fcafa7ce82faaec2e0464454aaa6c.zip
scilab-8c1dc2af8c3fcafa7ce82faaec2e0464454aaa6c.tar.gz
Merge commit 'origin/5.1'
Conflicts: scilab/modules/core/help/en_US/delbpt.xml scilab/modules/core/help/en_US/dispbpt.xml scilab/modules/core/help/en_US/dot.xml scilab/modules/core/help/en_US/exit.xml scilab/modules/core/help/en_US/mode.xml scilab/modules/core/help/en_US/setbpt.xml scilab/modules/core/help/en_US/try.xml scilab/modules/core/help/fr_FR/dot.xml scilab/modules/core/help/fr_FR/exit.xml scilab/modules/core/help/fr_FR/mode.xml scilab/modules/core/help/fr_FR/predef.xml scilab/modules/core/help/fr_FR/try.xml scilab/modules/fileio/help/fr_FR/getlongpathname.xml scilab/modules/fileio/help/fr_FR/getshortpathname.xml
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/help/en_US/intersci.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/intersci/help/en_US/intersci.xml b/scilab/modules/intersci/help/en_US/intersci.xml
index 5291c43..6c8dd39 100644
--- a/scilab/modules/intersci/help/en_US/intersci.xml
+++ b/scilab/modules/intersci/help/en_US/intersci.xml
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="ISO-8859-1"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- 2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2006-2008 - INRIA 4 * Copyright (C) 2006-2008 - INRIA