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

[git]

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

trondeau pushed a commit to branch next
in repository gnuradio.

commit d77dc4a00dbe71f9987ea94b1a042cb6d3ee5079
Merge: ebc478a 797b592
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 6 12:25:49 2014 -0400

    Merge branch 'master' into next

 gr-blocks/lib/multiply_matrix_cc_impl.cc |  19 ++---
 gr-blocks/lib/multiply_matrix_ff_impl.cc |  19 ++---
 gr-blocks/tests/benchmark_nco.cc         |   4 +-
 gr-blocks/tests/benchmark_vco.cc         |   4 +-
 gr-fec/include/gnuradio/fec/ber_bf.h     |  37 +++++++-
 gr-fec/lib/CMakeLists.txt                |   1 -
 gr-fec/lib/ber_bf_impl.cc                |  16 +---
 gr-fec/lib/ber_tools.cc                  | 117 -------------------------
 gr-fec/lib/ber_tools.h                   |  73 ----------------
 gr-fec/python/fec/qa_ber_bf.py           | 141 +++++++++++++++++++++++++++++++
 gr-uhd/lib/usrp_sink_impl.cc             |  16 ++--
 gr-uhd/lib/usrp_source_impl.cc           |   4 +-
 12 files changed, 213 insertions(+), 238 deletions(-)