[Commit-gnuradio] [gnuradio] 06/08: Merge remote-tracking branch 'tom/docs/fixes1' into maint

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 886ea8208a37b6ef4d52ca8716ebe2f15a7eed52
Merge: 4eb67da 290c69f
Author: Johnathan Corgan <address@hidden>
Date:   Wed Apr 29 14:27:23 2015 -0700

    Merge remote-tracking branch 'tom/docs/fixes1' into maint

 docs/doxygen/other/build_guide.dox                 |  4 ++--
 .../include/gnuradio/blocks/tagged_stream_align.h  |  4 ++--
 gr-fec/include/gnuradio/fec/awgn_bp.h              | 11 +++++-----
 gr-fec/include/gnuradio/fec/gf2mat.h               | 25 +++++++++++-----------
 4 files changed, 23 insertions(+), 21 deletions(-)