[Commit-gnuradio] [gnuradio] 06/06: Merge remote-tracking branch 'skoslowski/remove_wx_gen_mode' into next

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 50dc3145d69e20541d83dfb551d6b6ee1b3116bb
Merge: a27c212 324e72d
Author: Johnathan Corgan <address@hidden>
Date:   Thu Sep 8 12:29:13 2016 -0700

    Merge remote-tracking branch 'skoslowski/remove_wx_gen_mode' into next

 grc/blocks/options.xml             | 56 ++++---------------------------
 grc/core/Block.py                  |  3 +-
 grc/core/Connection.py             |  3 --
 grc/core/Constants.py              |  3 --
 grc/core/Param.py                  | 68 ++------------------------------------
 grc/core/Port.py                   |  8 -----
 grc/core/generator/Generator.py    |  8 +----
 grc/core/generator/flow_graph.tmpl | 44 ++----------------------
 8 files changed, 13 insertions(+), 180 deletions(-)