summaryrefslogtreecommitdiffstats
path: root/scilab/modules/helptools
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-03-02 09:50:36 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-03-02 09:50:36 +0100
commit1e31cf32e008bb057af4617380fb582730a4faef (patch)
treec7e869fb5e1fd5df7ee6eb81bbe5cff3ceeee73d /scilab/modules/helptools
parent2a364cad7a1ccea3e167839947322b0db51a5b24 (diff)
parent887e53a813b39b25a9649f84f39d90e8e5086029 (diff)
downloadscilab-1e31cf32e008bb057af4617380fb582730a4faef.zip
scilab-1e31cf32e008bb057af4617380fb582730a4faef.tar.gz
Merge remote branch 'refs/remotes/origin/5.2'
Diffstat (limited to 'scilab/modules/helptools')
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/CopyConvert.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/CopyConvert.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/CopyConvert.java
index 4af808c..7a07cfb 100644
--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/CopyConvert.java
+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/CopyConvert.java
@@ -116,7 +116,7 @@ public class CopyConvert extends DefaultHandler implements ErrorHandler {
116 * Run the copy/convert process 116 * Run the copy/convert process
117 * 117 *
118 * @param inFile Input file 118 * @param inFile Input file
119 * @param outFile Output file 119 * @param outputFile Output file
120 */ 120 */
121 public void run(File inFile, File outputFile) 121 public void run(File inFile, File outputFile)
122 throws SAXParseException, SAXException, IOException { 122 throws SAXParseException, SAXException, IOException {