[Commit-gnuradio] [gnuradio] 03/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 8c42ed29b70c7607397decaa8e58e32911ef6e3f
Merge: e8f725b 066a32c
Author: Johnathan Corgan <address@hidden>
Date:   Fri Dec 11 19:40:09 2015 -0800

    Merge branch 'maint'

 gnuradio-runtime/include/gnuradio/py_feval.h   |  1 -
 gnuradio-runtime/include/gnuradio/sys_pri.h    | 10 ++++-----
 gr-atsc/include/gnuradio/atsc/CMakeLists.txt   | 28 ++++++++++++++++++++++++++
 gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt |  2 ++
 gr-vocoder/gnuradio-vocoder.pc.in              |  2 +-
 gr-vocoder/include/gnuradio/vocoder/codec2.h   |  2 +-
 gr-vocoder/lib/CMakeLists.txt                  |  7 -------
 gr-vocoder/swig/CMakeLists.txt                 |  1 -
 8 files changed, 37 insertions(+), 16 deletions(-)