summaryrefslogtreecommitdiff
path: root/2.3-1/macros/GeneralFunctions
diff options
context:
space:
mode:
authoryash11122017-07-07 22:34:47 +0530
committeryash11122017-07-07 22:34:47 +0530
commit2a6c003c67faafd257984f4ae632e40bc6fa9a32 (patch)
tree5eecfb962980f7c32cd167bd7e124166e4741343 /2.3-1/macros/GeneralFunctions
parentce61940a1398e66d9d09b81241789576c1ceca01 (diff)
parent640f9fcf3f64298c7958f4bde5a7e6a7602a690d (diff)
downloadScilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.tar.gz
Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.tar.bz2
Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.zip
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to '2.3-1/macros/GeneralFunctions')
-rw-r--r--2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci4
1 files changed, 4 insertions, 0 deletions
diff --git a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci
index f7271e2e..77116a1f 100644
--- a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci
+++ b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci
@@ -20,6 +20,10 @@ function [FlagFound,SCIFileName] = SCI2CFindFile(PathList,FileName)
// --- Check input arguments. ---
// ------------------------------
SCI2CNInArgCheck(argn(2),2,2);
+<<<<<<< HEAD
+=======
+
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
FlagFound = 0;
SCIFileName = '';