[Commit-gnuradio] [gnuradio] 11/13: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit b51f27bdd122781e44c782292a2999d786e1ff8b
Merge: 3670680 820bd05
Author: Johnathan Corgan <address@hidden>
Date:   Sat Oct 17 09:35:09 2015 -0700

    Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'

 grc/gui/DrawingArea.py     | 8 ++++++++
 grc/python/Generator.py    | 3 ++-
 grc/python/flow_graph.tmpl | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)