[Commit-gnuradio] [gnuradio] branch master updated (efed1fe -> 64f3b70)

[git]

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

jcorgan pushed a change to branch master
in repository gnuradio.

      from  efed1fe   Merge remote-tracking branch 'tom/ctrlport_freq_mod'
       new  e2c5119   uhd: uhd_rx_cfile: fixed nsamples print statement in 
verbose mode
       new  b5418e2   Merge branch 'maint'
       new  311066b   qtgui: Added the ability to control the Y axis label for 
the freq sink - Useful if the input device is calibrated and one wants to 
display Power (dBm) rather than Relative Gain (dB)
       new  64f3b70   Merge remote-tracking branch 'daulpavid/freqsink_change'

The 4 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/grc/qtgui_freq_sink_x.xml                     | 17 +++++++++++++++++
 gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h |  3 +++
 gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h          |  1 +
 gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h          |  2 ++
 gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h      |  2 ++
 gr-qtgui/lib/FrequencyDisplayPlot.cc                   | 13 ++++++++++++-
 gr-qtgui/lib/freq_sink_c_impl.cc                       |  7 +++++++
 gr-qtgui/lib/freq_sink_c_impl.h                        |  1 +
 gr-qtgui/lib/freq_sink_f_impl.cc                       |  7 +++++++
 gr-qtgui/lib/freq_sink_f_impl.h                        |  1 +
 gr-qtgui/lib/freqdisplayform.cc                        |  6 ++++++
 gr-uhd/apps/uhd_rx_cfile                               |  2 +-
 12 files changed, 60 insertions(+), 2 deletions(-)