[Commit-gnuradio] [gnuradio] branch maint updated (0341203 -> d0eab54)

[git]

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

jcorgan pushed a change to branch maint
in repository gnuradio.

      from  0341203   Merge remote-tracking branch 
'jgilbert/template_expansion' into maint
       new  65e1d5d   ctrlport: change to doc; no -p flag required for 
gr-ctrlport-monitor
       new  0759dbf   ctrlport: change to doc; no -p flag required for 
gr-perf-monitorx
       new  ffad6b1   Merge remote-tracking branch 'tracierenea/ctrlport_doc' 
into maint
       new  44b038b   grc: stop overwritting modified param values in epy blocks
       new  bc36ab0   grc: rewrite block before adding connections during 
flowgraph import
       new  686288a   grc: ignore xml comments in block wrappers
       new  34f0313   grc: fix bug #856: paging/scrolling from keyboard
       new  d0eab54   Merge remote-tracking branch 
'gnuradio-wg-grc/maint_grcwg' into maint

The 8 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:
 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(-)