[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 70fecd437b264984569f6a4531dd3b424aced781
Merge: aff9b97 465d4e0
Author: Johnathan Corgan <address@hidden>
Date:   Wed Apr 29 14:44:01 2015 -0700

    Merge branch 'master' into next

 docs/doxygen/other/build_guide.dox                 | 12 +++++------
 .../include/gnuradio/blocks/tagged_stream_align.h  |  4 ++--
 gr-digital/lib/mpsk_snr_est.cc                     |  1 +
 gr-digital/lib/ofdm_chanest_vcvc_impl.cc           |  2 ++
 gr-digital/lib/pn_correlator_cc_impl.cc            |  3 ++-
 gr-digital/lib/simple_correlator_impl.cc           |  1 +
 gr-fec/include/gnuradio/fec/awgn_bp.h              | 11 +++++-----
 gr-fec/include/gnuradio/fec/gf2mat.h               | 25 +++++++++++-----------
 gr-uhd/examples/c++/tags_demo.cc                   |  3 ++-
 grc/base/Block.py                                  |  3 ++-
 10 files changed, 37 insertions(+), 28 deletions(-)