[Commit-gnuradio] [gnuradio] 01/01: 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 61ac8a9a685ef64db3d4478f4072b705d059e6ec
Merge: 2432ea6 64a702e
Author: Johnathan Corgan <address@hidden>
Date:   Wed Mar 9 07:44:26 2016 -0800

    Merge branch 'master' into next

 cmake/Modules/UseSWIG.cmake                |   4 +-
 gr-analog/lib/sig_source_X_impl.cc.t       |  32 ++-
 gr-analog/lib/sig_source_X_impl.h.t        |   2 +-
 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 +-
 8 files changed, 283 insertions(+), 271 deletions(-)