[Commit-gnuradio] [gnuradio] 08/10: 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 2579342b379c0e7f5fbe9e8799e0a973cf6971e4
Merge: 3ef5848 832563f
Author: Johnathan Corgan <address@hidden>
Date:   Fri Aug 28 08:51:16 2015 -0700

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

 grc/base/FlowGraph.py   | 2 +-
 grc/gui/Messages.py     | 5 ++++-
 grc/python/Generator.py | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)