[Commit-gnuradio] [gnuradio] 12/37: Merge remote-tracking branch 'gnuradio-wg-grc/grc_variable_blocks'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 62831422ae4b2a817a997153468008db38e06598
Merge: 2bb2b31 6d9dfac
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 11 10:03:27 2014 -0400

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

 gr-digital/grc/digital_constellation.xml      |  90 +++++++++++------------
 gr-digital/grc/digital_constellation_rect.xml | 102 ++++++++++++--------------
 grc/base/Block.py                             |   7 +-
 grc/python/Block.py                           |  10 +++
 grc/python/FlowGraph.py                       |   2 +-
 grc/python/block.dtd                          |   3 +-
 6 files changed, 106 insertions(+), 108 deletions(-)