[Commit-gnuradio] [gnuradio] 02/03: 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 9806cdfc165652b6b6df2d719780261b903ac223
Merge: d4bb541 49df052
Author: Johnathan Corgan <address@hidden>
Date:   Sun Oct 23 13:02:48 2016 -0700

    Merge branch 'maint'

 gnuradio-runtime/lib/controlport/rpcmanager.cc         | 5 -----
 gnuradio-runtime/lib/controlport/rpcserver_selector.cc | 4 ++++
 gr-atsc/CMakeLists.txt                                 | 1 +
 gr-atsc/swig/CMakeLists.txt                            | 2 +-
 gr-dtv/CMakeLists.txt                                  | 1 +
 gr-dtv/swig/CMakeLists.txt                             | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)