summaryrefslogtreecommitdiff
path: root/2.3-1/macros/SymbolTable/names
diff options
context:
space:
mode:
authoryash11122017-07-07 22:03:16 +0530
committeryash11122017-07-07 22:03:16 +0530
commit640f9fcf3f64298c7958f4bde5a7e6a7602a690d (patch)
treef2d5c577e9c719190f2ce68c976a9acefd6611c6 /2.3-1/macros/SymbolTable/names
parente9de337a34e123749927039f7011fb30fc96f7c9 (diff)
parent9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 (diff)
downloadScilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.gz
Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.bz2
Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.zip
Scilab2C Arduino Updated
Diffstat (limited to '2.3-1/macros/SymbolTable/names')
-rw-r--r--2.3-1/macros/SymbolTable/names3
1 files changed, 3 insertions, 0 deletions
diff --git a/2.3-1/macros/SymbolTable/names b/2.3-1/macros/SymbolTable/names
index c2efc843..2ce0db05 100644
--- a/2.3-1/macros/SymbolTable/names
+++ b/2.3-1/macros/SymbolTable/names
@@ -6,7 +6,10 @@ ST_GetInArgInfo
ST_GetSymbolInfo
ST_InsForCntVars
ST_InsOutArg
+<<<<<<< HEAD
ST_InsOutArg_Dup
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
ST_Load
ST_MatchSymbol
ST_Save