diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-01 12:42:34 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-01 12:42:34 -0400 |
| commit | 2a525ac04bcb0a70d193bddf9ba1018a99484904 (patch) | |
| tree | d55538ecb7fb9a0e006df239ccbd93b8bab3ed20 /docs/doxygen/other | |
| parent | fbd74560b72196fba9de8c6d01378b0715df758a (diff) | |
| parent | 888c07f2510c49b5100223121ee02d9faea287d9 (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-runtime/include/gr_logger.h
gr-digital/lib/packet_headergenerator_bb_impl.cc
gr-digital/python/ofdm_txrx.py
gr-digital/python/qa_ofdm_txrx.py
gr-digital/python/qa_packet_headergenerator_bb.py
gr-uhd/examples/python/usrp_spectrum_sense.py
Diffstat (limited to 'docs/doxygen/other')
| -rw-r--r-- | docs/doxygen/other/main_page.dox | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/doxygen/other/main_page.dox b/docs/doxygen/other/main_page.dox index deb6f8ebf8..3ad9e68021 100644 --- a/docs/doxygen/other/main_page.dox +++ b/docs/doxygen/other/main_page.dox @@ -45,6 +45,7 @@ More details on GNU Radio concepts: \li \ref page_metadata \li \ref volk_guide \li \ref page_pfb +\li \ref page_tagged_stream_blocks \section flowgraph Operating a Flowgraph |