[Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit d0eab54716703ed8aefec26539a6b94dfba38245
Merge: ffad6b1 34f0313
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 5 16:02:23 2016 -0700

    Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint

 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 +++----
 6 files changed, 21 insertions(+), 10 deletions(-)