[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 dea443be8ba31006a0fdf59ec4eccbb8798d69d1
Merge: 3adf49c f2b71d3
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 24 18:40:51 2014 -0500

    Merge branch 'master' into next

 gr-qtgui/CMakeLists.txt                       |  9 +++++++++
 gr-qtgui/doc/qtgui.dox                        | 22 ++++++++++++++++++++++
 gr-qtgui/gr-qtgui.conf                        | 10 ++++++++++
 gr-qtgui/include/gnuradio/qtgui/displayform.h |  1 -
 gr-qtgui/lib/const_sink_c_impl.cc             | 10 ++++++----
 gr-qtgui/lib/displayform.cc                   | 11 +----------
 gr-qtgui/lib/freq_sink_c_impl.cc              |  5 ++++-
 gr-qtgui/lib/freq_sink_c_impl.h               |  2 +-
 gr-qtgui/lib/freq_sink_f_impl.cc              |  3 +++
 gr-qtgui/lib/freqdisplayform.cc               |  2 +-
 gr-qtgui/lib/histogram_sink_f_impl.cc         | 10 ++++++----
 gr-qtgui/lib/sink_c_impl.cc                   |  3 +++
 gr-qtgui/lib/sink_f_impl.cc                   |  3 +++
 gr-qtgui/lib/time_raster_sink_b_impl.cc       |  9 ++++++---
 gr-qtgui/lib/time_raster_sink_f_impl.cc       |  9 ++++++---
 gr-qtgui/lib/time_sink_c_impl.cc              |  9 ++++++---
 gr-qtgui/lib/time_sink_f_impl.cc              |  9 ++++++---
 gr-qtgui/lib/waterfall_sink_c_impl.cc         | 19 +++++++++++--------
 gr-qtgui/lib/waterfall_sink_f_impl.cc         | 19 +++++++++++--------
 grc/python/flow_graph.tmpl                    |  1 +
 20 files changed, 116 insertions(+), 50 deletions(-)