diff options
| author | yash1112 | 2017-07-07 22:34:47 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:34:47 +0530 |
| commit | 2340409c98f9b15bb23944b991e97a1aa4e88ce0 (patch) | |
| tree | 8fa462e65aca52e5e933dee026a78c31baf0181c /macros/CCodeGeneration/names | |
| parent | f577f255fd5c1d30bc770e9b053823ada8684528 (diff) | |
| parent | 69c573fe2e59236f063aaa94dcd44b556f945cbc (diff) | |
| download | Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.gz Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.bz2 Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.zip | |
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to 'macros/CCodeGeneration/names')
| -rw-r--r-- | macros/CCodeGeneration/names | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/macros/CCodeGeneration/names b/macros/CCodeGeneration/names index 56caa81..96b24bd 100644 --- a/macros/CCodeGeneration/names +++ b/macros/CCodeGeneration/names @@ -2,7 +2,10 @@ C_FinalizeCode C_ForExpression C_Funcall C_GenDeclarations +<<<<<<< HEAD C_GenDeclarations_Dup +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 C_GenerateFunName C_GenerateLaunchScript C_GenerateMakefile |