[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 d9b79b71d0d87323a9e6285fbc751a94584b0365
Merge: e1b7ce5 6e3fbfd
Author: Johnathan Corgan <address@hidden>
Date:   Mon Nov 3 10:36:16 2014 -0800

    Merge branch 'master' into next

 gnuradio-runtime/include/gnuradio/block.h          |  5 ++
 gnuradio-runtime/include/gnuradio/block_detail.h   |  5 ++
 gnuradio-runtime/lib/block.cc                      | 10 +++
 gnuradio-runtime/lib/block_detail.cc               | 13 ++++
 gnuradio-runtime/swig/block.i                      |  1 +
 .../lib/correlate_access_code_tag_bb_impl.cc       |  5 +-
 .../python/digital/qa_correlate_access_code_tag.py | 80 ++++++++++++++++++++++
 grc/python/Generator.py                            |  6 +-
 grc/python/flow_graph.tmpl                         |  5 +-
 9 files changed, 125 insertions(+), 5 deletions(-)