[Commit-gnuradio] [gnuradio] 03/05: 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 1ccbb23b897e2b7b7ae057811c6b2fc1a08fd997
Merge: 9d24861 c73a73f
Author: Johnathan Corgan <address@hidden>
Date:   Sun Mar 26 20:28:53 2017 -0700

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

 gr-dtv/CMakeLists.txt      | 3 ---
 gr-dtv/swig/CMakeLists.txt | 2 +-
 gr-fec/CMakeLists.txt      | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)