[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'mbr0wn/modtool/mako' into next

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit d3cbf646159f3acc867278ef567a6df845e2221a
Merge: 00eeada 2dbbe48
Author: Johnathan Corgan <address@hidden>
Date:   Tue Dec 29 07:34:30 2015 -0800

    Merge remote-tracking branch 'mbr0wn/modtool/mako' into next

 cmake/Packaging/Fedora-15.cmake           |   3 +-
 cmake/Packaging/Fedora-16.cmake           |   3 +-
 cmake/Packaging/Fedora-17.cmake           |   1 +
 cmake/Packaging/Fedora-18.cmake           |   1 +
 cmake/Packaging/Ubuntu-10.04.cmake        |   1 +
 cmake/Packaging/Ubuntu-10.10.cmake        |   1 +
 cmake/Packaging/Ubuntu-11.04.cmake        |   1 +
 cmake/Packaging/Ubuntu-11.10.cmake        |   1 +
 cmake/Packaging/Ubuntu-12.04.cmake        |   1 +
 cmake/Packaging/Ubuntu-12.10.cmake        |   1 +
 cmake/Packaging/Ubuntu-13.04.cmake        |   1 +
 docs/doxygen/other/build_guide.dox        |   1 +
 gr-utils/CMakeLists.txt                   |  10 +
 gr-utils/python/modtool/__init__.py       |   3 +-
 gr-utils/python/modtool/code_generator.py |  60 ++--
 gr-utils/python/modtool/modtool_add.py    |  32 +-
 gr-utils/python/modtool/modtool_rename.py |   3 -
 gr-utils/python/modtool/templates.py      | 546 +++++++++++++++---------------
 18 files changed, 328 insertions(+), 342 deletions(-)