diff options
Diffstat (limited to '2.3-1/macros/CCodeGeneration/names')
| -rw-r--r-- | 2.3-1/macros/CCodeGeneration/names | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/2.3-1/macros/CCodeGeneration/names b/2.3-1/macros/CCodeGeneration/names index 56caa81d..96b24bdd 100644 --- a/2.3-1/macros/CCodeGeneration/names +++ b/2.3-1/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 |