[Commit-gnuradio] [gnuradio] branch next updated (b742cda -> 6c5d722)

[git]

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

trondeau pushed a change to branch next
in repository gnuradio.

      from  b742cda   Merge branch 'master' into next
      adds  4ba84a4   corrected wx fft vertical label from amplitude to power
      adds  2545114   wxgui: use complex_to_mag_squared instead of 
complex_to_mag in wxgui fftsink_nongl
      adds  f1ad36e   wxgui: corrected errors in wxgui fftsink_gl sample 
re-ordering
      adds  7888bb7   qtgui: corrected errors in qtgui frequency sink (f and c) 
sample ordering
      adds  d50c57a   Merge branch 'mossmann_qtgui'
       new  6c5d722   Merge branch 'master' into next

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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(-)