[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 2d0d3f87bbc5d370cb14e5978202b5cb66d1b045
Merge: ea2efe6 a03893d
Author: Johnathan Corgan <address@hidden>
Date:   Sun Sep 20 21:27:41 2015 -0700

    Merge branch 'master' into next

 gr-blocks/grc/blocks_tag_object.xml        |   6 +-
 gr-blocks/grc/blocks_vector_source_x.xml   |   2 +-
 gr-fft/include/gnuradio/fft/fft.h          |  16 +-
 gr-fft/include/gnuradio/fft/window.h       |  14 +-
 gr-fft/lib/CMakeLists.txt                  |   1 +
 gr-fft/lib/fft.cc                          | 122 +++++++-------
 gr-fft/lib/fft_vcc_fftw.cc                 | 113 ++++++-------
 gr-fft/lib/fft_vcc_fftw.h                  |   8 +-
 gr-fft/python/fft/qa_fft.py                | 262 ++++++++++++-----------------
 gr-trellis/examples/python/test_cpm.py     |   3 +-
 gr-utils/python/modtool/modtool_makexml.py |   9 +
 11 files changed, 261 insertions(+), 295 deletions(-)