[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

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

trondeau pushed a commit to branch next
in repository gnuradio.

commit 6c5d7224f65383f49d3fdf4643727e0d601022df
Merge: b742cda d50c57a
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 15 10:05:12 2014 -0400

    Merge branch 'master' into next

 gr-qtgui/lib/freq_sink_c_impl.cc       | 34 +++++++++++++++++++---------------
 gr-qtgui/lib/freq_sink_c_impl.h        |  1 +
 gr-qtgui/lib/freq_sink_f_impl.cc       | 34 +++++++++++++++++++---------------
 gr-qtgui/lib/freq_sink_f_impl.h        |  1 +
 gr-wxgui/python/wxgui/fft_window.py    |  6 +++---
 gr-wxgui/python/wxgui/fftsink_nongl.py | 12 ++++++------
 6 files changed, 49 insertions(+), 39 deletions(-)