summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos_blocks
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2010-03-23 16:53:26 +0100
committerClément DAVID <clement.david@scilab.org>2010-03-23 16:53:26 +0100
commit6d8044badd09a1af8e19eabfc552234367cfd2ba (patch)
tree604f8254ec89f09db056aee7be5092046e34ddcc /scilab/modules/scicos_blocks
parent5d73cd9fd0d38cf0ca3222fbf1bcd9ab3816b18d (diff)
parent5f85b5393682d4474f48bfa2b4ca53597120e1b9 (diff)
downloadscilab-6d8044badd09a1af8e19eabfc552234367cfd2ba.zip
scilab-6d8044badd09a1af8e19eabfc552234367cfd2ba.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/CHANGES_5.2.X scilab/modules/scicos_blocks/macros/Sinks/TOWS_c.sci scilab/modules/xcos/etc/Xcos-style.xml scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BlockFactory.java
Diffstat (limited to 'scilab/modules/scicos_blocks')
-rw-r--r--scilab/modules/scicos_blocks/blocks/TOWS_c.h5bin51488 -> 50752 bytes
-rw-r--r--scilab/modules/scicos_blocks/macros/Sinks/TOWS_c.sci2
2 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/scicos_blocks/blocks/TOWS_c.h5 b/scilab/modules/scicos_blocks/blocks/TOWS_c.h5
index 3689400..3d1289b 100644
--- a/scilab/modules/scicos_blocks/blocks/TOWS_c.h5
+++ b/scilab/modules/scicos_blocks/blocks/TOWS_c.h5
Binary files differ
diff --git a/scilab/modules/scicos_blocks/macros/Sinks/TOWS_c.sci b/scilab/modules/scicos_blocks/macros/Sinks/TOWS_c.sci
index 1b15ec6..6ebb2fb 100644
--- a/scilab/modules/scicos_blocks/macros/Sinks/TOWS_c.sci
+++ b/scilab/modules/scicos_blocks/macros/Sinks/TOWS_c.sci
@@ -105,7 +105,7 @@ case 'define' then
105 'xstringb(orig(1)+sz(1)/2-w/2,orig(2)-h-4,txt,w,h,''fill'');' 105 'xstringb(orig(1)+sz(1)/2-w/2,orig(2)-h-4,txt,w,h,''fill'');'
106 'e=gce();' 106 'e=gce();'
107 'e.font_style=style;'] 107 'e.font_style=style;']
108 exprs=[string(nz),string(varnam),string(herit)] 108 exprs=[string(nz);string(varnam);string(herit)]
109 x=standard_define([3.5 2],model,exprs,gr_i) 109 x=standard_define([3.5 2],model,exprs,gr_i)
110end 110end
111endfunction 111endfunction