[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 99ecf64c8bb143f86d22b62b17cb18d64ce661d7
Merge: de605e5 49f69ee
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 18 14:22:45 2014 -0400

    Merge branch 'master' into next

 gr-qtgui/include/gnuradio/qtgui/form_menus.h       |   1 -
 gr-qtgui/include/gnuradio/qtgui/number_sink.h      |   8 +-
 .../include/gnuradio/qtgui/numberdisplayform.h     |   1 -
 gr-qtgui/include/gnuradio/qtgui/qtgui_types.h      |  25 +-
 gr-qtgui/lib/histogramdisplayform.cc               |   2 +-
 gr-qtgui/swig/qtgui_swig.i                         |  21 +
 gr-utils/python/modtool/gr-newmod/CMakeLists.txt   |  10 +
 .../modtool/gr-newmod/docs/doxygen/Doxyfile.in     | 736 ++++++++++++++++-----
 .../gr-newmod/docs/doxygen/Doxyfile.swig_doc.in    | 670 +++++++++++++++----
 9 files changed, 1152 insertions(+), 322 deletions(-)