[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit fe823d38eb68d7a5c9baaff75382abbab67df6cc
Merge: 72dcbdb 1e232b2
Author: Johnathan Corgan <address@hidden>
Date:   Fri Feb 5 14:06:24 2016 -0800

    Merge branch 'maint'

 gr-analog/grc/analog_block_tree.xml              |   1 +
 gr-analog/grc/analog_random_uniform_source_x.xml |   1 -
 gr-uhd/grc/gen_uhd_usrp_blocks.py                |   4 +-
 grc/base/FlowGraph.py                            | 163 +++++++++++------------
 grc/gui/BlockTreeWindow.py                       |  28 ++--
 grc/python/FlowGraph.py                          |   5 +-
 6 files changed, 99 insertions(+), 103 deletions(-)