[Commit-gnuradio] [gnuradio] branch next updated (de605e5 -> 99ecf64)

[git]

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

trondeau pushed a change to branch next
in repository gnuradio.

      from  de605e5   Merge branch 'master' into next
      adds  91cf7f2   modtool: Updates to OOT docs, enables doxygen, removes 
some doxygen warnings
      adds  870d04e   Merge remote-tracking branch 'mbant/oot-docs-fix'
      adds  0ccbf64   qtgui: oops. Somehow, I feel this should produce a 
compiler warning.
      adds  49f69ee   qtgui: moving stuff around to avoid swig and Python.h 
warnings.
       new  99ecf64   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/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(-)