diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 10:19:13 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 10:19:13 -0700 |
commit | 09d8b895447b1507b80a27053b51361ea1684175 (patch) | |
tree | 93edf8d2ebedb3ffcf02edd79b16516c6333f0fb /docs/doxygen | |
parent | 090103c760a308101e2cbf3630f6bf46a2bb4d8e (diff) | |
parent | 7a1403796abd4f9df1483482ce06b169a3212be8 (diff) |
Merge branch 'master' into next
Conflicts:
gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
gr-atsc/lib/qa_atsci_single_viterbi.cc
Diffstat (limited to 'docs/doxygen')
-rw-r--r-- | docs/doxygen/other/stream_tags.dox | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/doxygen/other/stream_tags.dox b/docs/doxygen/other/stream_tags.dox index 01b91f5e21..2af431b526 100644 --- a/docs/doxygen/other/stream_tags.dox +++ b/docs/doxygen/other/stream_tags.dox @@ -201,7 +201,7 @@ would have to use the TPP_DONT tag propagation policy and handle the propagation internally. In no case is the value of the tag modified when propagating through a -block. This becomes relevent when using \ref page_tagged_stream_blocks. +block. This becomes relevant when using \ref page_tagged_stream_blocks. \section stream_tags_issues Notes on How to Use Tags |