diff options
| author | yash1112 | 2017-07-07 22:34:47 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:34:47 +0530 |
| commit | 2a6c003c67faafd257984f4ae632e40bc6fa9a32 (patch) | |
| tree | 5eecfb962980f7c32cd167bd7e124166e4741343 /2.3-1/macros/scilab2c.sci | |
| parent | ce61940a1398e66d9d09b81241789576c1ceca01 (diff) | |
| parent | 640f9fcf3f64298c7958f4bde5a7e6a7602a690d (diff) | |
| download | Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.tar.gz Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.tar.bz2 Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.zip | |
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to '2.3-1/macros/scilab2c.sci')
| -rw-r--r-- | 2.3-1/macros/scilab2c.sci | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci index 70290d09..aff3df69 100644 --- a/2.3-1/macros/scilab2c.sci +++ b/2.3-1/macros/scilab2c.sci @@ -12,7 +12,10 @@ function scilab2c(varargin) [lhs, rhs] = argn(); +<<<<<<< HEAD +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 select rhs // // scilab2c() @@ -198,7 +201,10 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"), userchoice = 1; end if (userchoice == 1) +<<<<<<< HEAD +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- LAUNCH SCI2C --- runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,Target,Board_name); end |