[Commit-gnuradio] [gnuradio] 07/07: Merge branch 'maint'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit e8769054c663d8d05d022e9a2d50aa2bd2e62e4e
Merge: 96c25b5 c1fb14a
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 28 14:42:05 2014 -0400

    Merge branch 'maint'

 gr-blocks/lib/file_meta_sink_impl.cc               |  6 +--
 gr-blocks/lib/file_meta_sink_impl.h                |  2 -
 gr-blocks/lib/file_meta_source_impl.cc             |  8 +--
 gr-blocks/lib/file_meta_source_impl.h              |  1 -
 gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h |  2 -
 gr-qtgui/lib/SpectrumGUIClass.cc                   | 60 +++++++++++-----------
 gr-qtgui/lib/ber_sink_b_impl.h                     |  3 --
 gr-qtgui/lib/const_sink_c_impl.cc                  |  7 +--
 gr-qtgui/lib/const_sink_c_impl.h                   |  3 --
 gr-qtgui/lib/freq_sink_c_impl.cc                   |  4 +-
 gr-qtgui/lib/freq_sink_c_impl.h                    |  3 --
 gr-qtgui/lib/freq_sink_f_impl.cc                   |  4 +-
 gr-qtgui/lib/freq_sink_f_impl.h                    |  3 --
 gr-qtgui/lib/histogram_sink_f_impl.cc              |  4 +-
 gr-qtgui/lib/histogram_sink_f_impl.h               |  3 --
 gr-qtgui/lib/number_sink_impl.cc                   |  4 +-
 gr-qtgui/lib/number_sink_impl.h                    |  3 --
 gr-qtgui/lib/time_raster_sink_b_impl.h             |  1 -
 gr-qtgui/lib/time_raster_sink_f_impl.h             |  1 -
 gr-qtgui/lib/time_sink_c_impl.cc                   | 10 ++--
 gr-qtgui/lib/time_sink_c_impl.h                    |  3 --
 gr-qtgui/lib/time_sink_f_impl.cc                   | 10 ++--
 gr-qtgui/lib/time_sink_f_impl.h                    |  3 --
 gr-qtgui/lib/waterfall_sink_c_impl.cc              |  8 ++-
 gr-qtgui/lib/waterfall_sink_c_impl.h               |  1 -
 gr-qtgui/lib/waterfall_sink_f_impl.cc              |  4 ++
 gr-qtgui/lib/waterfall_sink_f_impl.h               |  1 -
 27 files changed, 70 insertions(+), 92 deletions(-)

diff --cc gr-qtgui/lib/const_sink_c_impl.cc
index 0290140,a1e1d09..f7bdc01
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@@ -353,15 -354,9 +354,15 @@@ namespace gr 
      }
  
      void
 +    const_sink_c_impl::enable_grid(bool en)
 +    {
 +      d_main_gui->setGrid(en);
 +    }
 +
 +    void
      const_sink_c_impl::reset()
      {
-       gr::thread::scoped_lock lock(d_mutex);
+       gr::thread::scoped_lock lock(d_setlock);
        _reset();
      }