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

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 6918185ae6b7df2f9fdf6fc7de222fc5fb3e16dc
Merge: 24a05ca 5ae1e84
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 14 07:42:59 2015 -0700

    Merge branch 'maint'

 docs/doxygen/Doxyfile.in                      |  33 +++++-
 gnuradio-runtime/include/gnuradio/flowgraph.h |   2 +-
 gnuradio-runtime/lib/flat_flowgraph.h         |   2 +-
 gr-fec/lib/tpc_encoder.cc                     | 144 +++++++++++++-------------
 4 files changed, 104 insertions(+), 77 deletions(-)