[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 e80496e8f6dcb06fd600a73b68ea3a3eb2ad407c
Merge: c0381e0 0a1a76d
Author: Johnathan Corgan <address@hidden>
Date:   Wed Mar 9 07:34:58 2016 -0800

    Merge branch 'maint'

 cmake/Modules/UseSWIG.cmake                |   4 +-
 gr-fft/lib/CMakeLists.txt                  |   1 +
 gr-fft/lib/fft.cc                          |  53 ++--
 gr-filter/include/gnuradio/filter/firdes.h | 443 ++++++++++++++---------------
 gr-filter/lib/firdes.cc                    |  10 +-
 grc/base/Element.py                        |   9 +-
 6 files changed, 251 insertions(+), 269 deletions(-)