diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-10-14 18:29:14 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-10-14 18:29:14 -0400 |
| commit | e0fdd93625a6234ba0d9cabf6e6abfc4df9a2ec6 (patch) | |
| tree | 790aa8b0ef05517c4a14b697d245aac79cd21dd2 /grc/blocks | |
| parent | a27f67c7c8d083d6e07ca10161c0ce93b029ad86 (diff) | |
| parent | bbee6d500f0e47e3543fbaffcef67f0fdbb71e37 (diff) | |
Merge branch 'mergme/grc_work' into next
Diffstat (limited to 'grc/blocks')
| -rw-r--r-- | grc/blocks/gr_complex_to_float.xml | 4 | ||||
| -rw-r--r-- | grc/blocks/gr_float_to_complex.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/grc/blocks/gr_complex_to_float.xml b/grc/blocks/gr_complex_to_float.xml index 5b02c3d34a..05681b0b90 100644 --- a/grc/blocks/gr_complex_to_float.xml +++ b/grc/blocks/gr_complex_to_float.xml @@ -23,12 +23,12 @@ <vlen>$vlen</vlen> </sink> <source> - <name>out</name> + <name>re</name> <type>float</type> <vlen>$vlen</vlen> </source> <source> - <name>out</name> + <name>im</name> <type>float</type> <vlen>$vlen</vlen> <optional>1</optional> diff --git a/grc/blocks/gr_float_to_complex.xml b/grc/blocks/gr_float_to_complex.xml index a1644efd74..a42cff3589 100644 --- a/grc/blocks/gr_float_to_complex.xml +++ b/grc/blocks/gr_float_to_complex.xml @@ -18,12 +18,12 @@ </param> <check>$vlen > 0</check> <sink> - <name>in</name> + <name>re</name> <type>float</type> <vlen>$vlen</vlen> </sink> <sink> - <name>in</name> + <name>im</name> <type>float</type> <vlen>$vlen</vlen> <optional>1</optional> |