diff options
| author | Matt Ettus | 2009-09-24 22:34:06 -0700 |
|---|---|---|
| committer | Matt Ettus | 2009-09-24 22:34:06 -0700 |
| commit | 5c46578ba936de57e80594540804c964aa408f73 (patch) | |
| tree | cf164f8e3d80b78971fb2987740b7d957ee1f306 /grc/blocks/block_tree.xml | |
| parent | 35ada01aa8ae838d6d75bf063725218fa7e18f5f (diff) | |
| parent | 16474a0adb44dc81a8338a9c4a9a6dcab6f6328f (diff) | |
| download | gnuradio-5c46578ba936de57e80594540804c964aa408f73.tar.gz gnuradio-5c46578ba936de57e80594540804c964aa408f73.tar.bz2 gnuradio-5c46578ba936de57e80594540804c964aa408f73.zip | |
Merge commit 'origin' into new_eth
Conflicts:
.gitignore
Diffstat (limited to 'grc/blocks/block_tree.xml')
| -rw-r--r-- | grc/blocks/block_tree.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 5b45466f5..296f0ee91 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -22,6 +22,7 @@ <block>gr_wavfile_source</block> <block>gr_message_source</block> <block>pad_source</block> + <block>virtual_source</block> </cat> <cat> <name>Sinks</name> @@ -35,6 +36,7 @@ <block>gr_wavfile_sink</block> <block>gr_message_sink</block> <block>pad_sink</block> + <block>virtual_sink</block> </cat> <cat> <name>Graphical Sinks</name> @@ -250,6 +252,11 @@ <block>gr_descrambler_bb</block> </cat> <cat> + <name>Vocoders</name> + <block>blks2_cvsd_encode</block> + <block>blks2_cvsd_decode</block> + </cat> + <cat> <name>Probes</name> <block>gr_probe_avg_mag_sqrd_x</block> <block>gr_probe_density_b</block> |