diff options
Diffstat (limited to 'builder.sce')
| -rw-r--r-- | builder.sce | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/builder.sce b/builder.sce index 5938a588..9fe9f9f1 100644 --- a/builder.sce +++ b/builder.sce @@ -27,8 +27,15 @@ TOOLBOX_TITLE = 'Scilab 2 C Converter'; toolbox_dir = get_absolute_file_path('builder.sce'); tbx_builder_macros(toolbox_dir); +<<<<<<< HEAD +tbx_build_localization(TOOLBOX_NAME, toolbox_dir); +tbx_builder_help(toolbox_dir); +tbx_build_loader(TOOLBOX_NAME, toolbox_dir); +tbx_build_cleaner(TOOLBOX_NAME, toolbox_dir); +======= //tbx_builder_help(toolbox_dir); tbx_build_loader(TOOLBOX_NAME, toolbox_dir); +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 clear toolbox_dir TOOLBOX_NAME TOOLBOX_TITLE; // ==================================================================== |