[Commit-gnuradio] [gnuradio] 05/05: 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 7d1ead948a66aaa2ae1e4fc477d15af37d9c994e
Merge: 2164fcf 656e80a
Author: Johnathan Corgan <address@hidden>
Date:   Tue Sep 1 03:00:40 2015 -0700

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

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