[Commit-gnuradio] [gnuradio] 03/04: 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 697e0a4e59e81472b2d9bb1475940f46fdbf89fb
Merge: 49d36df 065b0ad
Author: Johnathan Corgan <address@hidden>
Date:   Sun Oct 23 13:11:03 2016 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-atsc/CMakeLists.txt
        gr-atsc/swig/CMakeLists.txt

 gnuradio-runtime/lib/controlport/rpcmanager.cc         | 5 -----
 gnuradio-runtime/lib/controlport/rpcserver_selector.cc | 4 ++++
 gr-blocks/python/grc_gnuradio/blks2/error_rate.py      | 3 +++
 gr-blocks/python/grc_gnuradio/blks2/selector.py        | 5 +++++
 gr-blocks/python/grc_gnuradio/blks2/tcp.py             | 4 ++++
 gr-digital/python/grc_gnuradio/blks2/packet.py         | 4 ++++
 gr-dtv/CMakeLists.txt                                  | 1 +
 gr-dtv/swig/CMakeLists.txt                             | 2 +-
 8 files changed, 22 insertions(+), 6 deletions(-)