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-blocks/grc | |
| 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-blocks/grc')
| -rw-r--r-- | gr-blocks/grc/blocks_complex_to_real.xml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gr-blocks/grc/blocks_complex_to_real.xml b/gr-blocks/grc/blocks_complex_to_real.xml index 0fe77dc1c..6737f1da3 100644 --- a/gr-blocks/grc/blocks_complex_to_real.xml +++ b/gr-blocks/grc/blocks_complex_to_real.xml @@ -24,13 +24,7 @@ </sink> <source> <name>re</name> - <type>real</type> + <type>float</type> <vlen>$vlen</vlen> </source> - <source> - <name>im</name> - <type>real</type> - <vlen>$vlen</vlen> - <optional>1</optional> - </source> </block> |