diff options
| author | jblum | 2009-03-24 19:45:55 +0000 |
|---|---|---|
| committer | jblum | 2009-03-24 19:45:55 +0000 |
| commit | 4f480479afac529eadc65f4e0bc6fe13e42553b3 (patch) | |
| tree | 6e08a8ecd0e523e43943454e3df8a42a77ce3ebf /grc/data/platforms | |
| parent | d9a4ecedfcd777262cde70554d6e6a7b4f0657c0 (diff) | |
| download | gnuradio-4f480479afac529eadc65f4e0bc6fe13e42553b3.tar.gz gnuradio-4f480479afac529eadc65f4e0bc6fe13e42553b3.tar.bz2 gnuradio-4f480479afac529eadc65f4e0bc6fe13e42553b3.zip | |
Merged r10666:10669 from jblum/vlen. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10678 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc/data/platforms')
| -rw-r--r-- | grc/data/platforms/python/block_tree.xml | 4 | ||||
| -rw-r--r-- | grc/data/platforms/python/blocks/Makefile.am | 4 | ||||
| -rw-r--r-- | grc/data/platforms/python/blocks/gr_add_xx.xml (renamed from grc/data/platforms/python/blocks/gr_add_vxx.xml) | 2 | ||||
| -rw-r--r-- | grc/data/platforms/python/blocks/gr_multiply_xx.xml (renamed from grc/data/platforms/python/blocks/gr_multiply_vxx.xml) | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/grc/data/platforms/python/block_tree.xml b/grc/data/platforms/python/block_tree.xml index 7e13aaff6..4e6ff01c4 100644 --- a/grc/data/platforms/python/block_tree.xml +++ b/grc/data/platforms/python/block_tree.xml @@ -42,9 +42,9 @@ </cat> <cat> <name>Operators</name> - <block>gr_add_vxx</block> + <block>gr_add_xx</block> <block>gr_sub_xx</block> - <block>gr_multiply_vxx</block> + <block>gr_multiply_xx</block> <block>gr_divide_xx</block> <block>gr_nlog10_ff</block> diff --git a/grc/data/platforms/python/blocks/Makefile.am b/grc/data/platforms/python/blocks/Makefile.am index 506648d45..a97266fba 100644 --- a/grc/data/platforms/python/blocks/Makefile.am +++ b/grc/data/platforms/python/blocks/Makefile.am @@ -59,7 +59,7 @@ dist_ourdata_DATA = \ blks2_wfm_tx.xml \ const_source_x.xml \ gr_add_const_vxx.xml \ - gr_add_vxx.xml \ + gr_add_xx.xml \ gr_agc2_xx.xml \ gr_agc_xx.xml \ gr_and_xx.xml \ @@ -124,7 +124,7 @@ dist_ourdata_DATA = \ gr_mpsk_receiver_cc.xml \ gr_mpsk_sync_cc.xml \ gr_multiply_const_vxx.xml \ - gr_multiply_vxx.xml \ + gr_multiply_xx.xml \ gr_mute_xx.xml \ gr_nlog10_ff.xml \ gr_noise_source_x.xml \ diff --git a/grc/data/platforms/python/blocks/gr_add_vxx.xml b/grc/data/platforms/python/blocks/gr_add_xx.xml index 479cdaae4..97ed9283c 100644 --- a/grc/data/platforms/python/blocks/gr_add_vxx.xml +++ b/grc/data/platforms/python/blocks/gr_add_xx.xml @@ -7,7 +7,7 @@ --> <block> <name>Add</name> - <key>gr_add_vxx</key> + <key>gr_add_xx</key> <import>from gnuradio import gr</import> <make>gr.add_v$(type.fcn)($vlen)</make> <param> diff --git a/grc/data/platforms/python/blocks/gr_multiply_vxx.xml b/grc/data/platforms/python/blocks/gr_multiply_xx.xml index ea0d555b6..60f65c274 100644 --- a/grc/data/platforms/python/blocks/gr_multiply_vxx.xml +++ b/grc/data/platforms/python/blocks/gr_multiply_xx.xml @@ -7,7 +7,7 @@ --> <block> <name>Multiply</name> - <key>gr_multiply_vxx</key> + <key>gr_multiply_xx</key> <import>from gnuradio import gr</import> <make>gr.multiply_v$(type.fcn)($vlen)</make> <param> |