[Commit-gnuradio] [gnuradio] 05/06: 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 cab562941fc56e2a72f22e83f630c670d7c52ffe
Merge: 0463962 ac726bd
Author: Johnathan Corgan <address@hidden>
Date:   Tue Dec 9 11:42:00 2014 -0800

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

 grc/blocks/pad_sink.xml    |   4 +-
 grc/blocks/pad_source.xml  |   4 +-
 grc/python/CMakeLists.txt  |   1 -
 grc/python/FlowGraph.py    |  80 +++++++++++------
 grc/python/Generator.py    | 214 ++++++++++++++++++++++++++++++++++++++-------
 grc/python/convert_hier.py | 116 ------------------------
 grc/python/flow_graph.tmpl |  14 ++-
 7 files changed, 243 insertions(+), 190 deletions(-)