[Commit-gnuradio] [gnuradio] 18/20: Merge remote-tracking branch 'sdh11/complexity'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 5e645075ebaeb1d32a0a4c7b2e99a4bed8220163
Merge: 73a1a0e 702b5b8
Author: Johnathan Corgan <address@hidden>
Date:   Fri Aug 28 11:47:07 2015 -0700

    Merge remote-tracking branch 'sdh11/complexity'

 grc/base/FlowGraph.py  | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++
 grc/blocks/options.xml |  6 ++++++
 2 files changed, 61 insertions(+)