summaryrefslogtreecommitdiff
path: root/macros/ASTManagement/names
diff options
context:
space:
mode:
authorBrijeshcr2017-07-08 20:18:17 +0530
committerGitHub2017-07-08 20:18:17 +0530
commitbd03b38be0918837e147e969c6bb2014900009db (patch)
tree2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /macros/ASTManagement/names
parent97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff)
downloadScilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.gz
Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2
Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.zip
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'macros/ASTManagement/names')
-rw-r--r--macros/ASTManagement/names8
1 files changed, 0 insertions, 8 deletions
diff --git a/macros/ASTManagement/names b/macros/ASTManagement/names
index 3045d39..9ba83f7 100644
--- a/macros/ASTManagement/names
+++ b/macros/ASTManagement/names
@@ -21,10 +21,7 @@ AST_ExtractNameAndScope
AST_GetASTFile
AST_GetFuncallPrm
AST_GetPrecAndLhsArg
-<<<<<<< HEAD
AST_HandleCC
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
AST_HandleEOL
AST_HandleEndFor
AST_HandleEndGenFun
@@ -32,7 +29,6 @@ AST_HandleEndProgram
AST_HandleEndWhile
AST_HandleFor
AST_HandleForStatem
-<<<<<<< HEAD
AST_HandleFunCC
AST_HandleFunRC
AST_HandleFuncArray
@@ -40,10 +36,6 @@ AST_HandleFuncArray2D
AST_HandleHeader
AST_HandleIfElse
AST_HandleRC
-=======
-AST_HandleHeader
-AST_HandleIfElse
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
AST_HandleWhileExpr
AST_HandleWhileStatem
AST_ParseEqualStruct