[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 c973b2c8def21cd3f73d7fc6e0fc6007bf734160
Merge: 75396b7 dd5a206
Author: Johnathan Corgan <address@hidden>
Date:   Sat Apr 11 10:47:41 2015 -0700

    Merge branch 'master' into next

 gnuradio-runtime/include/gnuradio/block.h          |    4 +-
 gr-fec/examples/CMakeLists.txt                     |    2 +
 gr-fec/examples/ber_curve_gen.grc                  | 1871 ++++++++++++++------
 .../{ber_curve_gen.grc => tpc_ber_curve_gen.grc}   | 1833 ++++++++++++++-----
 volk                                               |    2 +-
 5 files changed, 2768 insertions(+), 944 deletions(-)