[Commit-gnuradio] [gnuradio] 04/07: 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 1274197aaa56f3ba4b11adb9f33e26054e6a770f
Merge: 5974a3e 7ff241e
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 16 15:56:59 2014 -0700

    Merge branch 'maint'
    
    Conflicts:
        gr-filter/python/filter/qa_pfb_channelizer.py

 cmake/Modules/FindPortaudio.cmake                  | 25 ++++++++++++++++++----
 .../python/modtool/gr-newmod/python/__init__.py    |  6 +++++-
 2 files changed, 26 insertions(+), 5 deletions(-)