[Commit-gnuradio] [gnuradio] 06/06: Merge branch 'maint'

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 8b16d52c449fe56287bfefe380831600a37d9fce
Merge: ec67ecb ba53f10
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 1 11:48:38 2014 -0400

    Merge branch 'maint'

 cmake/Modules/FindQwt.cmake              | 1 +
 gnuradio-runtime/CMakeLists.txt          | 2 +-
 gr-audio/lib/alsa/alsa_sink.cc           | 2 +-
 gr-audio/lib/alsa/alsa_source.cc         | 2 +-
 gr-filter/grc/filter_pfb_channelizer.xml | 8 ++++++++
 gr-filter/grc/filter_pfb_synthesizer.xml | 8 ++++++++
 gr-filter/python/filter/pfb.py           | 4 ++++
 7 files changed, 24 insertions(+), 3 deletions(-)