summaryrefslogtreecommitdiff
path: root/macros/ASTManagement/%funcall_string.sci
diff options
context:
space:
mode:
authorBrijeshcr2017-07-07 18:19:27 +0530
committerGitHub2017-07-07 18:19:27 +0530
commit8ec9e70b6ffffb927a28941554cf18a822892d72 (patch)
tree082485f6bd03f8f0044066337699fbcf985f5e5a /macros/ASTManagement/%funcall_string.sci
parent2340409c98f9b15bb23944b991e97a1aa4e88ce0 (diff)
parent17a346fca351d03579d343a9debaa68acdd844d9 (diff)
downloadscilab2c-8ec9e70b6ffffb927a28941554cf18a822892d72.tar.gz
scilab2c-8ec9e70b6ffffb927a28941554cf18a822892d72.tar.bz2
scilab2c-8ec9e70b6ffffb927a28941554cf18a822892d72.zip
Merge branch 'master' into master
Diffstat (limited to 'macros/ASTManagement/%funcall_string.sci')
-rw-r--r--macros/ASTManagement/%funcall_string.sci2
1 files changed, 2 insertions, 0 deletions
diff --git a/macros/ASTManagement/%funcall_string.sci b/macros/ASTManagement/%funcall_string.sci
index c3101cbe..449cc744 100644
--- a/macros/ASTManagement/%funcall_string.sci
+++ b/macros/ASTManagement/%funcall_string.sci
@@ -5,6 +5,8 @@ function txt=%funcall_string(F)
// rhs : a list
// name : string, the name of the function
// lhsnb: number, the number of function lhs
+// Modified By: Ukasha Noor
+
<<<<<<< HEAD
if F.name <> 'disp'