diff options
| author | Josh Blum | 2013-03-31 22:30:00 -0700 |
|---|---|---|
| committer | Josh Blum | 2013-03-31 22:30:00 -0700 |
| commit | 993ff9e8c1050bad327041132828370986a72b28 (patch) | |
| tree | e0c58a41a120b4da8b55f42099ccea8d5517019a /gr-utils/src/python | |
| parent | 78ccc760124713a56c9c85729ac40844a97f0550 (diff) | |
| parent | 78cd4026c0a9b902162e94905b60a9dd44a07bb7 (diff) | |
| download | gnuradio-993ff9e8c1050bad327041132828370986a72b28.tar.gz gnuradio-993ff9e8c1050bad327041132828370986a72b28.tar.bz2 gnuradio-993ff9e8c1050bad327041132828370986a72b28.zip | |
Merge branch 'maint' into v3.6.4git_gras_support
Conflicts:
gnuradio-core/src/lib/runtime/gr_block.cc
gnuradio-core/src/lib/runtime/gr_block.h
Diffstat (limited to 'gr-utils/src/python')
| -rw-r--r-- | gr-utils/src/python/modtool/templates.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-utils/src/python/modtool/templates.py b/gr-utils/src/python/modtool/templates.py index 87eb9f470..58617336e 100644 --- a/gr-utils/src/python/modtool/templates.py +++ b/gr-utils/src/python/modtool/templates.py @@ -473,7 +473,7 @@ Templates['grc_xml'] = '''<?xml version="1.0"?> * optional (set to 1 for optional inputs) --> <sink> <name>in</name> - <type><!-- e.g. int, real, complex, byte, short, xxx_vector, ...--></type> + <type><!-- e.g. int, float, complex, byte, short, xxx_vector, ...--></type> </sink> <!-- Make one 'source' node per output. Sub-nodes: @@ -483,7 +483,7 @@ Templates['grc_xml'] = '''<?xml version="1.0"?> * optional (set to 1 for optional inputs) --> <source> <name>out</name> - <type><!-- e.g. int, real, complex, byte, short, xxx_vector, ...--></type> + <type><!-- e.g. int, float, complex, byte, short, xxx_vector, ...--></type> </source> </block> ''' |