summaryrefslogtreecommitdiff
path: root/grc/blocks
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-10-14 21:16:34 -0700
committerJosh Blum <josh@joshknows.com>2011-10-14 21:16:34 -0700
commit5805acef268354468b84e856b7144e3aa2435600 (patch)
tree2c75cb5b76cd8e1a8c507b6310c77a3d5c717940 /grc/blocks
parent1259a01a9479071bd1729a9c9496444f0a72509b (diff)
parente0fdd93625a6234ba0d9cabf6e6abfc4df9a2ec6 (diff)
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Diffstat (limited to 'grc/blocks')
-rw-r--r--grc/blocks/gr_complex_to_float.xml4
-rw-r--r--grc/blocks/gr_float_to_complex.xml4
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 &gt; 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>