[Commit-gnuradio] [gnuradio] 01/01: 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 eff39c93b2caef8906c38c3f424bcacb5cd0acd8
Merge: 5e383b0 d0eab54
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 5 16:12:39 2016 -0700

    Merge branch 'maint'

 docs/doxygen/other/ctrlport.dox |  4 ++--
 grc/base/FlowGraph.py           |  2 ++
 grc/base/Param.py               |  6 ++++--
 grc/base/ParseXML.py            |  1 +
 grc/base/Port.py                |  2 +-
 grc/gui/NotebookPage.py         | 13 ++++++++++---
 grc/python/Block.py             |  7 +++----
 7 files changed, 23 insertions(+), 12 deletions(-)