[Commit-gnuradio] [gnuradio] 05/08: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 4149239b5fe7ea1bcf51392c897a99704a6605d6
Merge: 6afc40e fa02d57
Author: Johnathan Corgan <address@hidden>
Date:   Sat Apr 4 09:48:13 2015 -0700

    Merge branch 'maint'
    
    Conflicts:
        volk

 gnuradio-runtime/lib/top_block_impl.cc           | 23 +++++++++++++++++++++--
 gnuradio-runtime/lib/top_block_impl.h            |  2 ++
 gnuradio-runtime/python/gnuradio/gr/top_block.py |  8 +++++++-
 gnuradio-runtime/swig/top_block.i                |  8 ++++++++
 gr-blocks/python/blocks/qa_hier_block2.py        | 16 ++++++++++++++++
 gr-digital/examples/ofdm/tunnel.py               | 11 ++++++-----
 6 files changed, 60 insertions(+), 8 deletions(-)